External merge tool support (WIP)

[Michael Gliwinski]

On Wednesday 04 Aug 2010 09:31:21 Ben Finney wrote:
> Gordon Tyler <gordon.tyler at gmail.com> writes:
> > I've been (slowly) working on better external merge tool support in
> > bzr and qbzr.
> 
> Thank you very much for moving this forward.

Great news indeed.

> > 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),
> 
> For consistency with ‘bzr diff --using FOO’, would that be better
> spelled ‘bzr merge --using FOO’?
> 
> One possible reason: it might be confusing if it suggests “using merge
> algorithm FOO”.
> 
> What do others think?

Yeah, consistency would be good here.

> > 'bzr mergetool' (post-merge, invokes merge tool for each file in the
> > working tree that has conflicts)
> 
> Would this not be better done in the ‘bzr diff’ code? That's what I use
> now, and it allows me to ‘bzr diff --using FOO’ and perform alterations
> with the program FOO.

How about 'bzr resolve'?  I think there was a talk about this a while ago.


-- 
Michael Gliwinski
Henderson Group Information Services
9-11 Hightown Avenue, Newtownabby, BT36 4RT
Phone: 028 9034 3319

**********************************************************************************************
The information in this email is confidential and may be legally privileged.  It is intended solely for the addressee and access to the email by anyone else is unauthorised.
If you are not the intended recipient, any disclosure, copying, distribution or any action taken or omitted to be taken in reliance on it, is prohibited and may be unlawful.
When addressed to our clients, any opinions or advice contained in this e-mail are subject to the terms and conditions expressed  in the governing client engagement leter or contract.
If you have received this email in error please notify support at henderson-group.com

John Henderson (Holdings) Ltd
Registered office: 9 Hightown Avenue, Mallusk, County Antrim, Northern Ireland, BT36 4RT.
Registered in Northern Ireland
Registration Number NI010588
Vat No.: 814 6399 12
*********************************************************************************