External merge tool support (WIP)

[Alexander Belchenko]

bzr resolve --using meld ?

Gordon Tyler пишет:
> So if I understand correctly, the suggestion is to move the --tool option from merge to resolve and remove the mergetool command?
> 
> Would you expect 'resolve --tool' to invoke the default merge tool or should it require an argument that identifies the tool to use from the configured list?
> 
> 
> On 2010-08-04, at 10:32 AM, Maritza Mendez <martitzam at gmail.com> wrote:
> 
>> Thank you very much!
>>
>> I agree with the other respondents that consistency is a good goal and
>> that 'merge then resolve' is more intuitive than 'merge then merge'.
>>
>> Again, thanks for taking on this important task.
>>
>> ~M
>>
>>
>> On 8/3/10, Gordon Tyler <gordon.tyler at gmail.com> wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> I've been (slowly) working on better external merge tool support in bzr
>>> and qbzr. I've reached a point where external merge tools can be
>>> configured through 'bzr qconfig' and then invoked through 'bzr merge
>>> - --tool' (merges and then invokes merge tool for each file that has
>>> conflicts), 'bzr mergetool' (post-merge, invokes merge tool for each
>>> file in the working tree that has conflicts) and 'bzr qconflicts'.
>>>
>>> The branches are lp:~doxxx/bzr/mergetools and lp:~doxxx/qbzr/mergetools
>>> for bzr and qbzr respectively. They're not ready for merge proposals yet
>>> since I still need to improve the qconfig and qconflicts UI, and
>>> consider providing bzr commands (other than qconfig) for managing
>>> external merge tools.
>>>
>>> However, I would appreciate any comments you may have on their current
>>> state and the approach I am taking.
>>>
>>> Thanks,
>>> Gordon
>>>
>>> -----BEGIN PGP SIGNATURE-----
>>> Version: GnuPG v1.4.10 (MingW32)
>>> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
>>>
>>> iQEcBAEBAgAGBQJMWOfiAAoJEIrPJfWinA2uXJkIAJ2qIKJGZ1EmKZ5lxNr2XQMv
>>> h6bUH50h7UBkahw5K6JTxavdYH/tZDL/V+fV3fUq6fKgIbCBykm05jhLdB1b8BDT
>>> xc05JDa4OZsf2NHFtfAcx+FIJ5ajrgTPSUQynt93ZSMORdKchT2sReqYGxcV8ZhF
>>> qYUM9hE10vMLzMQdqMX+U/QG+scHfJar89dn5SBXp3ewXWeQs74JwGkOR0ktzrtg
>>> LrQMkFsFiL7TXjN7kTIcxuPLJ9BffakfEd/x/kbJ1hOH7qJqvj7USle0CwBYYIlB
>>> bbsxi5/V1vdNhKffs3nLRFQJrIBGuLOFX7bih4OFdQ3es7SgtP6flzXLcKQeBws=
>>> =zA8p
>>> -----END PGP SIGNATURE-----
>>>
>>>
>>
> 
>