External merge tool support (WIP)

[Gordon Tyler]

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

On 8/5/2010 7:18 PM, Brian de Alwis wrote:
> On 5-Aug-2010, at 12:01 PM, Gordon Tyler wrote:
>> Automatically popping up a GUI merge tool during a merge operation could
>> be considered too intrusive, although one could say that the user should
>> be expecting it since they gave the --using option. However, to make it
>> less intrusive, perhaps bzr could prompt interactively for each file with
>> conflicts whether to launch the given merge tool?
> 
> I wondered about something like:
> 
> $ bzr merge --resolve-using meld
> 
> Or --resolve-conflicts?
> 
> On 5-Aug-2010, at 12:33 PM, John Arbash Meinel wrote:
>> 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.
> 
> I also thought remerge was the more logical candidate.

In addition to merge?

Ciao,
Gordon

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

iQEcBAEBAgAGBQJMW0foAAoJEIrPJfWinA2uLQYH/0qiiNfmFhdf1njPf162Vz+5
rqFp2oOLXOcnhGjVm00YuhIyrv0mAdf/hbT9IHFRknyh7kCD3NE4LPIZjla8vRgA
wmorLsBMuEHChtjrVyaHtlth5tLGKLJ0oNVEhSf0cKEztcBWh8PolscW0ORXf1tL
Fjz+OK/wHbliTr/bfv4rQVCcdJLOKrWe+kX+RivygeRRPKboaIq+mBn771rVKfRR
DyOsozOFEU5voJxF/NbdUKE0b0p2c6ET3y+XcaU0OA/Xs/ExE9u6PsuBst5PodtH
N3MFqv2S4HFYkFxdttxfNMsYwNpBy7NFd73sEbdaXOZ2A4PTbx13gID4KDb8A7g=
=6X/w
-----END PGP SIGNATURE-----