Re: [tycho-dev] gerrit @ eclipse

["Oberlies, Tobias" <tobias.oberlies@xxxxxxx>]

I have seen that Gerrit is configured [1] to "Merge if necessary" for our project. This means that it is possible to submit a change that doesn't have the current branch head as parent. Gerrit then creates a merge commit of the submitted change and the branch head.

I would like to avoid merges in the history (especially if there are no good reasons for them), and therefore would like to have this option disabled. This would mean that before submitting a change, it would need to be rebased to master and re-proposed - which is doable IMHO.


And a second proposal: Although I'm not a big fan of having to provide a Change-Id myself, I would still propose to "Require Change-Id in commit message". The reason is that this avoids the common error of creating new changes instead of new patch sets for existing changes. I just don't feel like having to explain proper Gerrit usage over and over again.


Comments? Opinions?

Best regards
Tobias


[1] https://git.eclipse.org/r/#/admin/projects/tycho/org.eclipse.tycho


> -----Original Message-----
> From: tycho-dev-bounces@xxxxxxxxxxx [mailto:tycho-dev-bounces@xxxxxxxxxxx]
> On Behalf Of Sievers, Jan
> Sent: Mittwoch, 15. Februar 2012 14:21
> To: Tycho developers list
> Subject: Re: [tycho-dev] gerrit @ eclipse
> 
> My proposal would be to use it as normal course of action but to leave the
> option open to by-pass gerrit.
> It will take us some time to get used to it and find our preferred working
> mode but I think now is a good time to get started.
> 
> Regards
> Jan
> 
> 
> 
> 
> -----Original Message-----
> From: tycho-dev-bounces@xxxxxxxxxxx [mailto:tycho-dev-bounces@xxxxxxxxxxx]
> On Behalf Of Igor Fedorenko
> Sent: Mittwoch, 15. Februar 2012 14:06
> To: tycho-dev@xxxxxxxxxxx
> Subject: Re: [tycho-dev] gerrit @ eclipse
> 
> Do you us all going through gerrit as normal course of action or this is
> mostly for external contributions?
> 
> --
> Regards,
> Igor
> 
> On 12-02-15 7:37 AM, Sievers, Jan wrote:
> > created https://bugs.eclipse.org/bugs/show_bug.cgi?id=371620
> >
> > -----Original Message-----
> > From: tycho-dev-bounces@xxxxxxxxxxx [mailto:tycho-dev-
> bounces@xxxxxxxxxxx] On Behalf Of Igor Fedorenko
> > Sent: Mittwoch, 23. November 2011 12:56
> > To: Tycho developers list; Tycho developers list
> > Subject: Re: [tycho-dev] gerrit @ eclipse
> >
> > Yes, agree, let's use gerrit. How hard is it to set it up?
> _______________________________________________
> tycho-dev mailing list
> tycho-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/tycho-dev
> _______________________________________________
> tycho-dev mailing list
> tycho-dev@xxxxxxxxxxx
> https://dev.eclipse.org/mailman/listinfo/tycho-dev