External merge tool support (WIP)

[Gordon Tyler]

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

On 8/4/2010 9:16 PM, Martin Pool wrote:
> On 5 August 2010 10:44, Gordon Tyler <gordon.tyler at gmail.com> wrote:
>> If the merge tool terminates with an exit
>> code of 0, the file is marked as resolved as 'bzr resolve <file>' would.
> 
> I wonder about that; it seems like often the tool itself will exit
> successfully regardless of whether the conflicts are resolved.

The extmerge plugin made the assumption that a retcode of 0 meant
success. If the merge tool used the %T option, for a temporary file that
is copied back over the result file, a retcode of 0 would make it copy
the file over and anything else would discard the temporary file.

However, I too am not quite comfortable with that assumption.

> To me it seems the main test should be whether the conflict markers
> have been removed.

Is there an easy way to test this, a function in bzrlib perhaps?

Ciao,
Gordon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJMWjObAAoJEIrPJfWinA2uMBoH/i0/cO0Lepwd8+4uN89qd/Ir
z3ymkJ+qjJ1ZAwK/dJJhYSZMG1mowKFF+xH9PEa5v8mtDceA/SJ84nOFI5BZ1TJo
hhah+XfEZcj0X6qKFWN1sWeUXtW3BG1SJlbtO3pKCn48Ew4DWrcPnZWLi5eeT4ec
k83KTFLhyR4RoausOa0x6kjBV/oFEDyWppQJATc7GcPmCgxGYNXUa/yu5Yoba5o2
Unx/2G2spb+aX0x51HZiJQfZvTMDv7V8Gb7FOJZk9PQIqS0fsogMMnarDiV/mi8j
7fTVXZHfe75sANWdnN/gFlvR7vC1LG2nWVRcVpJ4eTI/e+2qNB2y76njrHZ33gM=
=NubG
-----END PGP SIGNATURE-----