Better merge tool integration

[Martin Pool]

On 1 July 2010 10:59, Gordon Tyler <gordon.tyler at gmail.com> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Hi all,
>
> I'm working on bug 489915 (https://bugs.launchpad.net/bugs/489915) to
> improve bzr's integration with external merge tools like kdiff3, meld, etc.

That sounds great.

> My plan is:
>
> 1. Create a mergetools module in bzrlib which provides an API for
> configuring and invoking external merge tools.

Maybe there should be some commonality with other external tools
(editors, diff, etc).  But it may be better to do the specific case of
merge first.

> 2. Add 'bzr' commands for configuring and invoking the tools.

Can you tell us more about this?

I think the configuration should go into the generic config framework.

> 3. Modify qconflicts to use the mergetools module for invoking the tools.
> 4. Modify qconfig to use the mergetools module for configuring the tools.

.. and also regular command-line merge, remerge, conflicts, etc?

-- 
Martin