From: Lars Hjemli <hjemli@gmail.com>
Date: Thu, 20 Sep 2007 13:38:48 GMT
Subject: Re: [PATCH 0/2] add support for per branch merge policy
Message-ID: <8c5c35580709200638v75fcf611m7c6465d074c9244d@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.64.0709201424270.28395@racer.site>

[...joining two posts in one...]

On 9/20/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> > On 9/20/07, Lars Hjemli <hjemli@gmail.com> wrote:
> > > branch.<name>.integrationonly
> >
> > Btw: we might want to call this 'branch.<name>.mergepolicy' with the
> > possible values 'synchronize' and 'integrate'.
>
> IMHO this is way too limiting.
> Why not have something like branch.<name>.mergeOptions instead?

Yeah, that would be more powerful, I'll give it a try.

--
larsh