[ANN][PLUGIN] external merge

[John A Meinel]

Erik Bågfors wrote:
> Hi
> 
> I just created a small plugin that calls an external merge tool to
> help you resolve conflicts.
> 
> It works like this
> 
> $ bzr merge
> opps, conflicts
> $ bzr extmerge --all
> 
> The tool will be called once for each file that conflicts.  You can
> also call it with "bzr extmerge file".
> 
> $ bzr resolve --all
> $ bzr commit
> 
> The external tool called can be set in bazaar.conf, if not set, it
> will try kdiff3, xxdiff and opendiff in that order.

Actually, though it is more designed for 2-way diffing, vimdiff will
accept multiple targets (I've certainly done 3 before).

> 
> The tool need to be able to accept 4 files, this, other, base and
> output file (foo.THIS, foo.OTHER, foo.BASE and foo).  I don't think
> meld can be called this way, my meld is dying on me, so I can't verify
> that.
> 
> You can find it at http://erik.bagfors.nu/bzr/plugins/extmerge/
> 
> btw, I'm not happy with the name, but couldn't think of any better.
> 
> Regards,
> Erik

I would tend to 'mv foo foo.unused; mv foo.THIS foo' and then start the
external program with the 3 files foo.BASE, foo.OTHER, and foo

That would work well for both meld and for vimdiff. I'm not sure about
the other diff programs. The meld people have been very receptive to
patches, at least from Aaron. :)

John
=:->

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060219/550f526f/attachment.pgp