Hi,

If you agree to go for cherry-pick option, could you comment on the bug
383898, Denis Roy is waiting for confirmation.

Thanks,
Patrick

On Tue, Jul 17, 2012 at 10:55 AM, Marc Khouzam <marc.khou...@ericsson.com>wrote:

>
>
> > -----Original Message-----
> > From: linuxtools-dev-boun...@eclipse.org
> > [mailto:linuxtools-dev-boun...@eclipse.org] On Behalf Of akurtakov
> > Sent: Tuesday, July 17, 2012 10:53 AM
> > To: Linux Tools developer discussions
> > Subject: Re: [linuxtools-dev] Gerrit merge strategy
> >
> > I wouldn't mind it if the dependencies problem is fixed now.
>
> I believe this limitation is still present.
> It has not yet proven to cause CDT any issues, but committers
> should be aware of it.
>
> Marc
>
> >
> > Alex
> >
> > On Tue, Jul 17, 2012 at 5:46 PM, Alexandre Montplaisir
> > <alexandre.montplai...@polymtl.ca> wrote:
> > > Hi all,
> > >
> > > We've been using the new Gerrit for the past week, and
> > we're loving it ;)
> > >
> > > However I've noticed the merge strategy in the Project
> > Options is set to
> > > "Merge If Necessary", which is the default value. This
> > creates a lot of
> > > empty merge commits if the commit we're merging wasn't
> > based exactly on
> > > the latest master.
> > >
> > > What would you guys think about using the "Cherry-pick"
> > option instead?
> > > It means that every patch gets rebased on the master before being
> > > merged. This would guarantee that the git history remains
> > linear, which
> > > makes it much easier to bisect, and is prettier in general.
> > >
> > >
> > > CDT had a similar discussion in the past, see
> > > https://bugs.eclipse.org/bugs/show_bug.cgi?id=375448
> > > Now they are indeed using the "Cherry-pick" option.
> > >
> > >
> > > Cheers,
> > >
> > > --
> > > Alexandre Montplaisir
> > > DORSAL lab,
> > > École Polytechnique de Montréal
> > >
> > > _______________________________________________
> > > linuxtools-dev mailing list
> > > linuxtools-dev@eclipse.org
> > > https://dev.eclipse.org/mailman/listinfo/linuxtools-dev
> > _______________________________________________
> > linuxtools-dev mailing list
> > linuxtools-dev@eclipse.org
> > https://dev.eclipse.org/mailman/listinfo/linuxtools-dev
> >
> _______________________________________________
> linuxtools-dev mailing list
> linuxtools-dev@eclipse.org
> https://dev.eclipse.org/mailman/listinfo/linuxtools-dev
>
_______________________________________________
linuxtools-dev mailing list
linuxtools-dev@eclipse.org
https://dev.eclipse.org/mailman/listinfo/linuxtools-dev

Reply via email to