Re: [Gnu-arch-users] NEW: three-way merges / conflict markers

[Karel Gardas]

On Sat, 20 Sep 2003, Tom Lord wrote:

>
> arch has traditionally indicated conflicts by generating .rej files
> containing hunks that `patch(1)' rejects.
>
> Sometimes people ask, instead, to have diff3 or CVS style conflict
> markers left in the file being patched.   Like:
>
>       <<<<<<< TREE
>         this is what
>         you had in your tree
>         =======
>       this is what the merged-from
>         revision had instead
>         >>>>>>> MERGED-FROM
>
>
> With the head revision of tla--devo--1.1, you can get that style of
> merge with:
>
>       % tla star-merge -t  MERGED-FROM-REV
>
> or
>
>       % tla star-merge --three-way  MERGED-FROM-REV

Cool! Since...

> (Note3: presumably this is between 90% and 100% of an enabler for
> integration with fancy graphical merge tools.  If someone makes
> progress in that area, lemme know what's missing (or even better,
> whats-missing :-).)

...many GUI diff tools support exactly this! i.e. at least TkDiff and my
favorite xxdiff.

Thanks,

Karel
--
Karel Gardas                  address@hidden
ObjectSecurity Ltd.           http://www.objectsecurity.com