Merge algorithms

[Eli Zaretskii]

> Date: Mon, 8 Nov 2010 10:34:17 +1100
> From: Andrew Bennetts <andrew.bennetts at canonical.com>
> Cc: bazaar at lists.canonical.com
> 
> Then this should be just as effective, and also apply to /foo/bar/z:
> 
> [/foo/bar]
> changelog_merge_files = lib/ChangeLog

Okay, I will try that next.  Thanks.

> > I couldn't find any explicit sign in .bzr.log of the plugin being
> > loaded and used.  The only difference between a merge that uses the
> > plugin and the one that doesn't is this entry:
> > 
> >   Base revid: 'eliz at gnu.org-20101029104927-webtjc116gt5cefb'
> > 
> > (To be more precise, I show below the full log of a merge that used
> > the plugin; the merge that doesn't use it looks identical, except that
> > the above entry is absent.)  Is that expected?
> 
> To be honest I wouldn't have expected it to vary at all!  The plugin doesn't yet
> log anything

Well, somebody, I think it was Robert, said way up this thread:

> > > Date: Mon, 25 Oct 2010 08:49:15 +1300
> > > From: Robert Collins <robertc at robertcollins.net>
> > > Cc: Andrew Bennetts <andrew.bennetts at canonical.com>, bazaar at lists.canonical.com
> > > 
> > > On Sun, Oct 24, 2010 at 5:36 AM, Eli Zaretskii <eliz at gnu.org> wrote:
> > > > Perhaps I'm missing something.  Can I get the plugin write something
> > > > into .bzr.log, so I could be sure it is being invoked?
> > > 
> > > bzr should log that its loaded the plugin :)
      ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
So I thought this log is a standard feature, not something each plugin
should do on its own.