Frankly, it sounds like a good idea, and anyone who has GNU diff
installed just as easily has GNU diff3.
Zack, would you have time to work up the patch?
-Karl
Zack Weinberg <zack@codesourcery.com> writes:
> Precisely. It's a well-known algorithm. If you have RCS installed on
> your computer, "man merge" will describe one implementation. The
> "diff3" utility is also handy.
>
> > This is potentially better than separating the operations into
> > diff/patch, because the single program has the complete source files
> > available when applying the patch, rather than just n lines of
> > context. This lets it deal with modifications in the working copy
> > more intelligently.
>
> Again yes. In fact, since CVS uses 3-way merge (using rcs's merge
> utility) and there are plenty of situations where merge will get a
> conflict resolution right and diff+patch won't, I could argue that
> this represents a regression from CVS and has to be fixed before 1.0 :-)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sat Oct 21 14:37:05 2006