External merge tool support (WIP)

[Maritza Mendez]

On Thu, Aug 5, 2010 at 1:28 AM, Martin Pool <mbp at canonical.com> wrote:

> On 5 August 2010 13:40, Gordon Tyler <gordon.tyler at gmail.com> 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?
>
> I think it will be more generally useful on resolve and remerge.  I
> can imagine calling an external tool being quite useful with eg
>
>  bzr merge -r -1..-2 --using meld foo.c
>
> I think we need to work on the state machine Maritza described:
> sometimes you might want to use a tool to attempt the automatic merge,
> and sometimes (probably more important) you just want to run a tool on
> the conflicts.  In that case you want to be able to run it several
> times with eg interactive resolve.  It would be nice if merge could
> automatically kick this off if there are conflicts.
>
> --
> Martin
>
>
Martin, you say it much clearer than I could.  That's exactly what I meant.
It would be great if merge could ease the user into resolving conflicts (if
any).

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