[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [tycho-dev] Change submit policy to "Rebase if necessary"?

@Jan: I don't know for sure, but I would assume that as long as we keep the "Automatically resolve conflicts" option set to FALSE, Gerrit will never try to merge multiple changes to the same file.

Configuration change is requested here: https://bugs.eclipse.org/bugs/show_bug.cgi?id=464532

Regards
Tobias

> -----Original Message-----
> From: tycho-dev-bounces@xxxxxxxxxxx [mailto:tycho-dev-
> bounces@xxxxxxxxxxx] On Behalf Of Pascal Rapicault
> Sent: Montag, 13. April 2015 13:38
> To: Tycho developers list
> Subject: Re: [tycho-dev] Change submit policy to "Rebase if necessary"?
> 
> +1
> 
> On 04/13/2015 03:56 AM, Sievers, Jan wrote:
> > +1
> >
> > I assume it fails if rebase can't be done automatically?
> >
> > Jan
> >
> > From: tycho-dev-bounces@xxxxxxxxxxx [mailto:tycho-dev-
> bounces@xxxxxxxxxxx] On Behalf Of Oberlies, Tobias
> > Sent: Freitag, 10. April 2015 21:38
> > To: Tycho developers list (tycho-dev@xxxxxxxxxxx)
> > Subject: [tycho-dev] Change submit policy to "Rebase if necessary"?
> >
> > Hey devs,
> >
> > Me again with a project setup proposal :-)
> >
> > I would like to try out the Gerrit submit policy "Rebase if necessary".
> With this policy in place, we would be able to press "Submit" where we
> now have to press "Rebase" and then "Submit". The main benefit of this is
> that no new Gerrit build would be triggered (as far as I know) - which
> either pointless if we manually set the Verified flag, or causes a delay
> of approx. 30 minutes.
> >
> > Any thoughts?
> >
> > All the best
> > Tobias
> >
> > _______________________________________________
> > tycho-dev mailing list
> > tycho-dev@xxxxxxxxxxx
> > To change your delivery options, retrieve your password, or unsubscribe
> from this list, visit
> > https://dev.eclipse.org/mailman/listinfo/tycho-dev
> 
> _______________________________________________
> tycho-dev mailing list
> tycho-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe
> from this list, visit
> https://dev.eclipse.org/mailman/listinfo/tycho-dev