[Starlingx-discuss] r/2018.10 branch merges complete

Dean Troyer dtroyer at gmail.com
Mon Oct 1 20:40:11 UTC 2018

On Mon, Oct 1, 2018 at 3:21 PM Penney, Don <Don.Penney at windriver.com> wrote:
> For backporting a fix to r/2018.10, I've got a repo setup on that branch and cherry-picked the change, and I'm building a load to test while waiting for Zuul to process the update to master. Maybe a stupid question, but do I need to change the "Change-Id" for the commit (ie. delete it and amend the commit) to avoid collision with the original when I create the new gerrit review?

No, in fact for cherry-picking you want the change-id to be the same.
Gerrit understands this and will do it for you if you do the
cherry-pick in the web UI.  This simplifies matching the reviews.



Dean Troyer
dtroyer at gmail.com

More information about the Starlingx-discuss mailing list