[Gnu-arch-users] Re: tla apply-changeset --three-way ??

[Matthieu Moy]

Zenaan Harkness <address@hidden> writes:

> Is there a patch/plan for apply-changeset "--three-way" option?

That's not so simple as it seem to be: Suppose you have a patch saying
rougly this

 context line before
-line to remove
+line to add
 context line after

And try to apply it to a file where the strings "context line before",
"line to remove" and "context line after" are not present. Then, patch
can simply not do anything.

star-merge --three-way works in a very different way. It doesn't rely
on patches, but on the full text verison of you file, the file to
merge, and the common ancestor. Then, diff3 can do the merge using
those diff3 markers for conflicts.

-- 
Matthieu