Re: "svn diff" and "svn merge" sittin' in a tree

I hate to pull the emergency break this late in the design, but after
the recent discussion on using diff3 in "svn update", I think we're
wasting our time designing an "svn merge" which simply takes the diffs
from "svn diff" and applies them to the working copy. It will work, but
it will never be as satisfying as CVS is.

What we really want to do is take the same plaintexts as "svn diff" uses
to make its diffs, and do a three-way-merge with them and the working
copy.

---------------------------------------------------------------------
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:06 2006