[ovirt-devel] Gerrit parallel patch handling and CI (Or, why did my code fail post-merge)

Dan Kenigsberg danken at redhat.com
Mon Nov 21 07:04:18 UTC 2016


On Sun, Nov 20, 2016 at 06:09:59PM +0200, Nir Soffer wrote:
> On Sun, Nov 20, 2016 at 5:12 PM, Barak Korren <bkorren at redhat.com> wrote:
> >> With the current setting (in vdsm), submitting a series of patches is
> >> a huge pain. Sometimes refreshing the page and submitting the next
> >> patch in the series works, but sometimes you have to rebase again
> >> the next patches in the series, and in the worst cases, you have to
> >> do several rebases in the same series. This when the entire series
> >> was already rebased properly before the submit.
> >
> > Actually vdsm is configured to "Cherry Pick" ATM, I'm not sure what
> > were the reasons for this, but this should probably be changed to
> > ff-only ASAP b/c as it is, it allows patches to be submitted
> > completely out-of-order.
> >
> >> In vdsm we were bitten by this many times, and both Dan and me agree
> >> now that fast-forward is the only way.
> >>
> >> I don't think we need to agree on all projects for this, the whole point
> >> of having multiple project is that we don't to agree on every little
> >> detail, the project maintainer can do whatever they want.
> >
> > Ok, so can we get an agreement between the vdsm maintainers to change
> > to "ff-only"?
> 
> +1
> 
> Dan, can you confirm?

I enjoyed the freedom of cherry-pick, but after 2 broken nightly builds
in the span of 10 days, I give up. Let's try ff-only.

Dan.



More information about the Devel mailing list