External merge tool support (WIP)

[John Arbash Meinel]

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

Ben Finney wrote:
> Gordon Tyler <gordon.tyler at gmail.com> writes:
> 
>> The 'bzr mergetool' command has been removed and instead I've added a
>> '--using <tool>' option to the 'bzr resolve' command, which invokes the
>> tool for each file specified or all files with unresolved conflicts if
>> the '--all' option is given. If the merge tool terminates with an exit
>> code of 0, the file is marked as resolved as 'bzr resolve <file>'
>> would.
> 
> I'm ambivalent on this change.
> 
> On the one hand, I think that ‘bzr merge’ is not the right place to
> invoke a merge tool (despite the term for such a tool), as others have
> pointed out.
> 
> On the second hand, ‘bzr resolve’ already has an established meaning: to
> tell Bazaar that the change *is now* resolved, with no further changes
> needed. Your option muddies that meaning, by a conflicting meaning of
> *making new changes*. I think that change in meaning is not something to
> do lightly, and we should not allow it without a compelling reason.

Note that we *do* have 'bzr remerge' which reverts the contents and lets
you re-run the merge (or the merge of a specific file) using a different
merge algorithm. That might be a reasonable place to hang this off as well.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAkxa59AACgkQJdeBCYSNAAOwYQCgpZuwtU6hbrzut1vNf0SqyBqO
O4UAn01iO9YUoaBm09dfBpfjQPUv4Hwq
=O/Cd
-----END PGP SIGNATURE-----