<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Sep 13, 2016 at 7:29 PM, Nigel Babu <span dir="ltr"><<a href="mailto:nigelb@redhat.com" target="_blank">nigelb@redhat.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">On Fri, Sep 02, 2016 at 10:25:01AM +0530, Nigel Babu wrote:<br>
> > > The reason cherry-pick was chosen was to keep the branch linear and<br>
> > > avoid merge-commits as (I'm guessing here) this makes the tree hard to<br>
> > > follow.<br>
> > > Merge-if-necessary will not keep the branch linear. I'm not sure how<br>
> > > rebase-if-necessary works though.<br>
> > ><br>
> > > Vijay, can you provide anymore background for the choice of<br>
> > > cherry-pick and you opinion on the change?<br>
> > ><br>
> ><br>
> > Unfortunately I do not recollect the reason for cherry-pick being the<br>
> > current choice. FWIW, I think dependencies were being enforced a while<br>
> > back in the previous version(s) of gerrit. Not sure if something has<br>
> > changed in the more recent gerrit versions.<br>
> ><br>
><br>
> According to the documentation, the behavior was intended to be like how it is<br>
> currently. If it worked in the past, it may have been a bug. Let me setup<br>
> a test with Rebase-If-Necessary. Then we can make an informed decision on which<br>
> way to go about it.<br>
><br>
> --<br>
> nigelb<br>
<br>
</span>I tested out Rebase-If-Necessary. This bit is very important:<br>
<br>
When cherry picking a change, Gerrit automatically appends onto the end of the<br>
commit message a short summary of the change's approvals, and a URL link back<br>
to the change on the web. The committer header is also set to the submitter,<br>
while the author header retains the original patch set author.<br>
<br>
When using Rebase-If-Necessary, Gerrit does none of this. I'm guessing this is<br>
a problem for us?<br></blockquote><div><br></div><div>It is a problem, yes.<br></div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div class="HOEnZb"><div class="h5"><br>
--<br>
nigelb<br>
______________________________<wbr>_________________<br>
Gluster-devel mailing list<br>
<a href="mailto:Gluster-devel@gluster.org">Gluster-devel@gluster.org</a><br>
<a href="http://www.gluster.org/mailman/listinfo/gluster-devel" rel="noreferrer" target="_blank">http://www.gluster.org/<wbr>mailman/listinfo/gluster-devel</a><br>
</div></div></blockquote></div><br><br clear="all"><br>-- <br><div class="gmail_signature" data-smartmail="gmail_signature"><div dir="ltr">Pranith<br></div></div>
</div></div>