Custom merge tools

[马旋（SuperMMX）]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi, Greg Ward <greg-bzr at gerg.ca> :

On Thu, 2 Apr 2009 09:55:03 -0400
Greg Ward <greg-bzr at gerg.ca> wrote:

> Hi --
> 
> Is it possible for Bazaar to invoke a custom merge tool like kdiff3 or
> meld?  

Yes, there is a plugin called extmerge (http://erik.bagfors.nu/bzr-plugins/extmerge/)
which does exactly what you want.

> I like that the default behaviour is to write out the three
> "base/mine/other" files; that's much better than the traditional "run
> merge and hope the user understands what <<<< and >>>> mean" approach.
>  However, those three files are even better when used with a GUI
> diff/merge tool.  Right now, after a conflict I have to run
> 
>   kdiff3 conflicting-file.{THIS,MINE,OTHER} -o conflicting-file
> 
> for each conflicting file.  Is there a way to automate this?  I
> couldn't find anything in the user reference manual or the wiki.

You mean at the time merging ? I am not sure about this.
When you do merging, bzr will report the conflict files,
then you can run "bzr extmerge [FILE]" to resolve the conflicts
with the tool you like.

So the whole flow look like this:

bzr merge other-branch
bzr extmerge

I hope this helps.

- -- 
A. Because it makes the logic of the discussion difficult to follow.
Q. Why shoudn't I top post?
A. No.
Q Should I top post?

A: Because it destroys the flow of the conversation
Q: Why is it bad?
A: No, it's bad.
Q: Should I top post in replies to mailing lists? 
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (MingW32)

iEYEARECAAYFAknU1YUACgkQYjhzyV/TMxupYgCggoJBBUccvnW6WVcJHVGlGycv
G88Ani5hxU4eHPV6gWBr4ZETbXhRiniV
=9Twk
-----END PGP SIGNATURE-----