[ANN][PLUGIN] graphical diff using kompare

Aaron Bentley aaron.bentley at utoronto.ca
Thu Apr 27 00:52:18 BST 2006


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

Stephen Ward wrote:
| On Tuesday 25 April 2006 21:54, Michael wrote:
| Configuring a more generic plugin to default to the user's favorite
tool is
| dead simple, with the new ALIASES feature.
|
| Hmmm, I wonder how much this overlaps with the extmerge plugin...

The notion of using a GUI merge tool as part of the merge application
process used to give the the crawling horrors.  What if you're halfway
through doing the merge when the user decides to exit?

But now that we're doing all the merging up front, before we even touch
the working tree, I say "hell yeah!"  It's utterly safe to use an
unreliable merger, because if the merger fails, we abort before we
change the working directory.  So bring on "--merge-type meld" and the rest.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD4DBQFEUAey0F+nu1YWqI0RAsk5AJ4mLckiJWPHZgtkMjYB0dW9q+PODQCYqo97
Ug/ichtMoEZqUsOxih0rlw==
=Wlul
-----END PGP SIGNATURE-----




More information about the bazaar mailing list