[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

RE: Request for Feature: svn resolved

From: Dale Worley <dworley_at_pingtel.com>
Date: 2004-12-15 15:48:39 CET

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.?)


-----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

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.