Re: [mylyn-dev] stop requiring fast-forwards

[Sam Davis <sam.davis@xxxxxxxxxxx>]

It seems like everyone likes rebase if necessary. Steffen, are you able to make this change or should I open a bug in Community/Gerrit?

--
Sam Davis
Software Engineer, Tasktop Dev
Committer, Eclipse Mylyn
http://tasktop.com

On Wed, Dec 10, 2014 at 4:55 PM, Sam Davis <sam.davis@xxxxxxxxxxx> wrote:

On Wed, Dec 10, 2014 at 1:36 PM, Matthias Sohn <matthias.sohn@xxxxxxxxx> wrote:

the downside of the cherry-pick strategy is that it breaks patch series into individual commits

so if you have a series of commits depending on each other in review cherry-pick will not

respect the commit dependencies which is likely to break the build if the changes really

depend on each other.

Thanks for pointing that out. While it is the documented behaviour, my experience using the cherry-pick strategy with Gerrit 2.8 is that it doesn't actually work that way. Instead, it seems to have the same behaviour as the Fast Forward Only strategy: commits go into a "submitted" state and it periodically tries to merge them. But I don't like that either, because it's easy not to notice that the change wasn't merged.

+1 for "Rebase if Necessary"