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

Re: svn update/diff handles renames confusingly

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2004-02-15 23:25:16 CET

kfogel@collab.net writes:

> > After some consideration, my problem seems to boil down to:
> >
> > - svn diff doesn't work across renames
> > - svn update doesn't handle renames at all
> > - svn update conflict resolution for renames is bizarre and confusing
> >
> > Do you guys have a test SVN repository I can use for this?
> The second point above is still very surprising to me.

Why is it surprising? A rename in Subversion is a "copy"
(add-with-history) and a "delete". While the new "copy" destination
tracks its source (as "copyfrom-path" and "copyfrom-rev" in the
entries file), the "delete" entry doesn't point to the new
destination. So if you have a rename as a local mod, and someone else
changes the file you renamed, "svn update" doesn't have the ability to
see that it should apply the diffs coming down the wire not to the
schedule-deleted thing, but to the schedule-add-with-history other
thing. We've talked in the past about solving this (and similar
complaints) simply by storing forward pointers in the "delete" half of
the local rename operation.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Sun Feb 15 23:26:22 2004

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

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