RE: Request for Feature: svn resolved

I would assume that since Subversion knows the exact lineage of every line
in every file that its merging algorithm would be a lot more sophisticated
than "diff the two versions, apply the patch to the third version". (And if
it doesn't, what's the point of keeping the history of file moves, etc.?)

Dale

-----Original Message-----
From: Ben Collins-Sussman [mailto:sussman@collab.net]

Conflicts don't just happen when 'svn merge' tries to patch an
already-modified file. A conflict can happen anytime a patch doesn't
apply cleanly.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 15 15:51:47 2004