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

Re: Misinforming the user on rename with local changes

From: François Beausoleil <fbeausoleil_at_ftml.net>
Date: 2004-11-11 18:48:33 CET

Nicklas Norling wrote:
>> My conclusion was that this can result in potential dataloss if Bob
>> updates and then commits, without running status. His local changes
>> to lib/file.txt won't make it to the repository, but the rest of his
>> changes will.
>>
>> The solution ? svn update should say if it /unversions/ (is that a
>> word ?) a file.
>>
> <snip>
> Shouldn't update move the users file to the new location and then
> proceede with a normal patch (possibly
> resulting in a conflict)? It seems to me svn alread know all it needs in
> order to do this automatically?
> Of course if the file was svn removed and then svn added it should just
> be removed from versioning.
> /Nicke

Unfortunately, Subversion doesn't have the required information at this
time. A move is a copy + delete. So, libcomplex/file.txt is a copy of
lib/file.txt@1, and lib/file.txt was deleted in rev 2.

svn mv is no different than doing the following:
svn copy -r1 lib/file.txt libcomplex/file.txt
svn delete lib/file.txt

Hope I've explained myself clearly enough.

Bye !
François

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Nov 11 18:54:19 2004

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