Bob Peterson wrote:
>This is insufficient. The WC file will still exist in the wrong case, but it
>will trip up SVN when trying to update or commit all existing working
>copies. The six steps I gave are the necessary and sufficient steps. They
>are couched in terms of TortoiseSVN, but they ought to translate directly to
>command line SVN.
>
>1) TSVN Rename file.java to _file.java.
>2) TSVN Commit the parent folder. That logs an ADD _file.java and DELETE
>file.java.
>3) TSVN Update all other working copies.
>4) TSVN Rename _file.java to File.java
>5) TSVN Commit the parent folder.
>6) TSVN Update all other working copies.
>
>
Ah yes, you're right. Whilst using URLs will fix the repository, you'll
still be left with dodgy working copies. I really don't like the
rename-with-underscore bit of this fix, but it actually is required:
C:\temp\wc>svn info file1.txt
Path: file1.txt
Name: file1.txt
URL: file:///c:/temp/repos/file1.txt
Repository UUID: 9d6edd8c-b4e9-f54c-9721-419c9105ccbc
Revision: 2
Node Kind: file
Schedule: normal
Last Changed Author: mmason
Last Changed Rev: 2
Last Changed Date: 2003-12-15 16:32:42 +0000 (Mon, 15 Dec 2003)
Text Last Updated: 2003-12-15 16:32:29 +0000 (Mon, 15 Dec 2003)
Checksum: 318271dee0cd6cc050324f00c1cb7bca
C:\temp\wc>svn mv -m "changed case" file:///c:/temp/repos/file1.txt
file:///c:/temp/repos/File1.txt
Committed revision 3.
C:\temp\wc>svn up
svn: Obstructed update
svn: Failed to add file 'File1.txt': object of the same name already exists
C:\temp\wc>del file1.txt
C:\temp\wc>svn up
Restored file1.txt
svn: Obstructed update
svn: Failed to add file 'File1.txt': object of the same name already exists
The problem is that step 3 in the recipe above is quite hard, and you
end up with ickiness in your history. The problem with the URL move is
that you end up with a hosed working copy (I haven't found a way to get
my WC to update from the above state -- it keeps trying to restore
file1.txt and I can't ask it to explicitly update File1.txt first...)
Er, so does the FAQ entry need to be longer and fully cover all of this?
Cheers,
Mike.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Dec 22 14:45:21 2003