[ANN][PLUGIN] external merge

[John A Meinel]

Wouter van Heyst wrote:
> On Mon, Feb 20, 2006 at 09:18:34AM +0100, Erik Bågfors wrote:
>> 2006/2/20, Martin Pool <mbp at sourcefrog.net>:
>>> On Sat, 2006-02-18 at 16:10 +0100, Erik Bågfors wrote:
>>>> Hi
>>>>
>>>> I just created a small plugin that calls an external merge tool to
>>>> help you resolve conflicts.
>>>>
>>>> It works like this
>>>>
>>>> $ bzr merge
>>>> opps, conflicts
>>>> $ bzr extmerge --all
>>>>
>>>> The tool will be called once for each file that conflicts.  You can
>>>> also call it with "bzr extmerge file".
>>> Perhaps we could have this behaviour builtin as say 'bzr merge
>>> --interactive', or automatically turned on by a user preference?  It
>>> could also be called from say 'bzr remerge --interactive'.
>> I'm fine with that. What darcs does is have it automatically turned on
>> by a user preference, but darcs doesn't provide a way to do it AFTER
>> the merge.  If I remember correctly, darcs also commits the resolution
>> for you automatically.  This has annoyed me, since I prefer to be able
>> to review it.
> 
> Throwing up a conflict resolution interface (optionally) directly after
> a merge sounds good, but I prefer triple-checking before committing the
> result. Some people might like that feature, could get messy with
> non-merge changes being present.
> 

I don't think bzr will ever commit a merge without user review. It is
something that all of the main developers prefer. I suppose someone
could write a plugin which has a post-merge step that checks to see if
there are conflicts, and if not, calls 'bzr commit', but that would
definitely not be a mainline feature.

John
=:->



-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060220/d2de8d93/attachment.pgp