Merge algorithms

[Martin Pool]

On 6 November 2010 20:11:16 UTC+11, Eli Zaretskii <eliz at gnu.org> wrote:
>> From: Eli Zaretskii <eliz at gnu.org>
>> Date: Mon, 25 Oct 2010 05:53:33 -0400
>> Cc: bazaar at lists.canonical.com
>>
>> > Date: Mon, 25 Oct 2010 12:02:24 +1100
>> > From: Andrew Bennetts <andrew.bennetts at canonical.com>
>> > Cc: bazaar at lists.canonical.com
>> >
>> > The confusion is that there are two quite different places you can
>> > configure
>> > this plugin, but they have not very distinct names: in per-user
>> > configuration file (~/.bazaar/locations.conf) or in a per-branch
>> > configuration file ($my_branch/.bzr/branch/branch.conf).  Unfortunately
>> > I've
>> > confused you so that you've tried to use a configuration file that
>> > doesn't
>> > exist as far as Bazaar as concerned
>> > ($my_branch/.bzr/branch/branch.conf).
>>
>> I tried in ~/.bazaar as well, although perhaps not as thoroughly.  I
>> will try again, thanks for setting me straight.
>
> I tried again, and it indeed works, thanks.  I think I know what I did
> wrong previously, when I tried it in ~/.bazaar/locations.conf: the
> file name in [/foo/bar] was not the top-level directory of a bzr
> branch, but rather the top-level directory of a repository, which is
> the parent of several branches.  I now defined several sections
> instead, one each for every branch where I want this functionality.
> Is that the correct setup?

You should not need to list each of the branches: normally the config
machinery will use the most specific matching section.

> Re-reading the help text again, I think it's mostly okay, except that
> I would suggest to tell explicitly that [/home/user/proj] should name
> a branch.  There's also a double colon "::" which is probably a typo.

:: is syntax in the ReST markup language indicating a verbatim/monospace block.

>
> Thanks again for this nice feature.  Given enough testing and positive
> feedback from others, I would suggest to make it part of bzrtools.

If this is generally useful, let's see about merging it in in a clean
way.  I don't see much point in having bzrtools as a grab bag of
generally-useful facilities: put them either in core, or in a specific
plugin.

-- 
Martin