Merge algorithms

[Andrew Bennetts]

Andrew Bennetts wrote:
[...]
> I agree it's pretty simple to implement.  Write a plugin using the
> merge_file_content hook.  Look at the news_merge plugin in the bzr tree
> or the bzr-builddeb plugin's merge_file_content hook for examples.
> 
> I *might* look doing this myself next week if no-one has done it first,
> and I haven't forgotten over the weekend...

I didn't forget :)

Here you go:

    https://launchpad.net/bzr-changelog-merge

Quick start guide:

    bzr branch lp:bzr-changelog-merge ~/.bazaar/plugins/changelog_merge
    
    bzr help changelog_merge

I've only done the most minimal testing, so it may eat your branch, hard drive,
cat, etc.  I've tried to document the obvious limitations, but there may be
others I've overlooked.

As you can see the code is fairly simple, so it's probably fairly easy to
improve.

If you want a more complex example for inspirations, the news_merge or
bzr-builddeb plugins are probably good starting points.

Patches, bugs, and volunteers to be maintainer welcome :)

-Andrew.