External merge tool support (WIP)

Gordon Tyler gordon.tyler at gmail.com
Thu Aug 5 04:40:39 BST 2010


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

On 8/4/2010 9:19 PM, Ben Finney wrote:
> 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.

Bear in mind that 'bzr resolve' has other options which cause the
conflict to be resolved by taking either THIS or OTHER. This is just
another way of resolving the conflict, using an external tool.

> On the gripping hand, I still think ‘bzr diff --using TOOL’ is a good
> way to invoke a merge tool and make further changes. How does this new
> functionality compare with that?

Diff is not the same as merge. I certainly can see improving the
external tool support for diff but I don't see how an external merge
tool is relevant to the diff command?

>> I have also renamed the '--tool' option on the 'bzr merge' command to
>> '--using'.
> 
> I'm still concerned that, attached to the ‘bzr merge’ command, this is
> confusing. It's not clear that the meaning of this option is to use a
> particular tool, rather than use a particular merge algorithm.

I agree it is somewhat confusing. I personally prefer it on the resolve
command. I added the --using option on the merge command because
somebody (Martin Pool?) suggested it, but I think I may remove it after
all unless somebody can provide a good reason for it to stay?

Ciao,
Gordon


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

iQEcBAEBAgAGBQJMWjK3AAoJEIrPJfWinA2u1DsH/1p7x3gZDLfwMEuUKQbW1aO2
qFZ9/cvufqg3WtsPNL/cMKE20+4+QzHOEq6RV1bN9NzZViCYCWOtXk3Hw2x6OLaa
i+fwsDKJwpqB2sYoHZQmGTGGNw4Zb5aFawsJlvU3YbidtMKT78S0OczMhUBQjU2W
1I9lonhnSNBqSmmdUXZoVzxW4b5xiDA+v27rluPNPwO83OdcMWFthn/MlGVnKAcK
wDgdsiXSlOM4tzA5Po79l9DktYmJMH5KoTfKr/ES355z+13k3hoPjy2Ohl5cROxn
BTlCz9GOxZ7QfjdxZs8ZU6DPu9JqMHlffqFRlAJMSiNZT7LPecNiJtzGDvNtyzc=
=uQMP
-----END PGP SIGNATURE-----



More information about the bazaar mailing list