Re: Gerrit Merge "<gerrit topic>" commits

[Gerald Combs <gerald () wireshark org>]

On 1/30/14 6:17 AM, Bálint Réczey wrote:
> Hi,
>
> 2014-01-30 Evan Huus <eapache () gmail com>:
> > I believe the simpler answer is that the submit type has been set to "Merge If Necessary" which means if changes are 
> > not submitted exactly on top of the change they were authored on, Gerrit will produce a merge automatically.
> I suggested using "Cherry Pick" for "Change Submit Action" and I would
> like to bring it up again.
> BTW this is what is documented on our workflow page.
> http://wiki.wireshark.org/Development/Workflow :
> "After all the criteria are met any Core Developer can push the
> "Submit Change" button; integration to the target branch does not
> happen automatically.
>
> Changes are cherry-picked to the target branch by Gerrit to keep the
> history linear. The rationale behind this is that while merging would
> reflect the history more accurately, linear history is easier to
> interpret by humans. Changes with dependencies are cherry-picked after
> all dependencies are cherry-picked, too. When a cherry-pick can't be
> done without conflict, the change needs to be updated in the review. "
>
> This is how I set up Gerrit at my previous job, too.

I changed the "Change Submit Action" for Wireshark to "Cherry Pick". In
case anyone is interested the official documentation is at

http://test.code.wireshark.org/review/Documentation/project-setup.html#submit_type

and a discussion of the various options on the repo-discuss (Gerrit)
Google group is at

https://groups.google.com/forum/#!topic/repo-discuss/GInKJgLUa2w
___________________________________________________________________________
Sent via:    Wireshark-dev mailing list <wireshark-dev () wireshark org>
Archives:    http://www.wireshark.org/lists/wireshark-dev
Unsubscribe: https://wireshark.org/mailman/options/wireshark-dev
             mailto:wireshark-dev-request () wireshark org?subject=unsubscribe