Merge algorithms

[Eli Zaretskii]

> Date: Tue, 28 Sep 2010 12:32:14 +1000
> From: Andrew Bennetts <andrew.bennetts at canonical.com>
> Cc: bazaar at lists.canonical.com
> 
> Eli Zaretskii wrote:
> [...]
> > > IIRC, the filename is relative to the root of the tree, so "ChangeLog" will not
> > > match "src/ChangeLog".  If you need a more flexible policy let me know and I'll
> > > figure out how to adjust the plugin.
> > 
> > I would like ChangeLog files to in any subdirectory of the root to use
> > this plugin.
> 
> Ok, I've pushed a small hack to the plugin to make it do that.  Separately I'll
> look at improving the helpers in bzrlib to make it easier for plugins to support
> arbitrary policies here (matching full paths, or matching base names, or
> matching globs, or $arbitrary_function...).
> 
> I've also tweaked the plugin help to hopefully be a bit clearer about how to
> configure it in branch.conf vs. locations.conf.

Thanks, and sorry for a delay.  (I had a large job on my feature
branch, and didn't merge from there until today.)

I seem to be unable to get this plugin have any visible effect on
merged ChangeLog files.  The result seems to be identical whether or
not I have the required section in my locations.conf.  I still get
conflicts, and the stuiff from the OTHER branch is not where I expect
to see it according to "bzr help changelog_merge".  I tried both
~/.bazaar/locations.conf and the `.bzr/branch' subdirectory of the
branch into which I merged.

Perhaps I'm missing something.  Can I get the plugin write something
into .bzr.log, so I could be sure it is being invoked?

TIA