Comment 7 for bug 723968

Thanks so much for the real world testing! In general replacing the whole changelog_merge directory in plugins is the way to try the new plugin (or use an environment variable such as BZR_PLUGINS_AT as a temporary override), but in this case I'd only updated the one file so that was fine.

I removed that description from the implementation because it's no longer accurate. It gives the right idea, but in practice that example doesn't actually work like that (the implied common BASE version in that example contains just OLD-1, so “OLD-2” would actually be new-in-this from the perspective of this algorithm). I noticed this when I tried to turn that exact example into a unit test :)

I've just updated the help text in __init__.py in a new revision to be accurate, although sadly a bit less concrete. You can see the change <http://bazaar.launchpad.net/~spiv/bzr-changelog-merge/non-head-edits-723968/revision/7>. You're welcome to suggest improvements, of course :)

Given that this seems to be working well I'll go ahead and merge this to trunk and close this bug… then propose bundling this plugin with bzr. Thanks!