Merge algorithms

[Eli Zaretskii]

> 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 think I'll tweak bzr-changelog-merge so that you can pass a -D debug flag
> to make it report on if it is finding configuration settings, and if it is
> finding files matching those settings, etc.

That'd be good.

> I also clearly need to tweak the help text, but perhaps I should actually
> just remove most of the attempt at quick start help and refer to the main
> bzr docs for configuration?  I'm not sure.  Suggestions are welcome!

I will be sure to voice any suggestions I might have once I succeed in
getting this to work.  Thanks.