[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Gnu-arch-users] Re: <<< conflict markers

From: Jan Hudec
Subject: Re: [Gnu-arch-users] Re: <<< conflict markers
Date: Wed, 14 Apr 2004 22:53:19 +0200
User-agent: Mutt/

On Wed, Apr 14, 2004 at 16:11:28 -0400, Stefan Monnier wrote:
> > diff3-style conflict markers really only make sense when the program
> > creating them has three files on hand: ANCESTOR, MINE, and YOURS.
> > `replay', `redo', etc. all work (currently) on the basis of diffs, not
> > 3-way merges.
> One exception: `update' could very well use diff3.

It currently does not keep a copy handy, so it's not _that_ simple.

> But it would have the same effect as `tla star-merge --three-way', so it
> would be a bit redundant.

But star-merge is far less efficient for this.

replay and update would equivalent with three-way merge. So I'd actualy
prefer a replay, that, if a conflict occured, would resort to building
the ancestor and yours trees and calling diff3. It can be done

> > They have only one file on hand (MINE) plus a set of
> > diffs from ANCESTOR to YOURS.   They don't use that style of conflict
> > marker for the same reason that `patch (1)' doesn't --- patch can
> > _guess_ where the conflicting hunk goes, but it doesn't know for sure,
> > and doesn't know what lines in MINE it conflicts with.
> I wish there was a tool that would do the guessing and turn the .rej
> into conflict markers.  Can't be done reliably in general, but it

There is: wiggle

> could be useful if used interactively (and with the option to fail
> if the guess is too far fetched).

                                                 Jan 'Bulb' Hudec 

Attachment: signature.asc
Description: Digital signature

reply via email to

[Prev in Thread] Current Thread [Next in Thread]