External merge tool support (WIP)

[Maritza Mendez]

On Wed, Aug 4, 2010 at 8:40 PM, Gordon Tyler <gordon.tyler at gmail.com> wrote:

> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 8/4/2010 9:19 PM, Ben Finney wrote:
> > 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?
>
>
Gordon, after working a few minutes with your branches, my preliminary
impression is that I agree for all the same reasons that

bzr resolve --using tool

makes sense and that

bzr merge --using tool

is likely to cause confusion without adding essential capability.

I have also been guilty of forgetting that 'bzr resolve' can actually
perform a resolution (albeit in in some trivial cases) as well as assert
that a resolution has occurred.  Reflecting on this only strengthens my
agreement with what you and Ben wrote in the quote above.

And based on just a few minutes of experimenting, I already like it!

Thanks
~M
-------------- next part --------------
An HTML attachment was scrubbed...
URL: https://lists.ubuntu.com/archives/bazaar/attachments/20100804/dc44ee8e/attachment.htm