Hi all,
I think I've stuffed things up big time, screwed up my working
copy and probably caused angst to the repository. I'm running Windows XP
on the desktop and Win2000 on the server, the latest version of svn and
TortoiseSVN and have a directory structure:
project root
|
+- dir1
| + dir1A
| + dir1B
| + dir1C
|
+- dir2
+ dir2A
+ dir2B
+ dir2C
I tried to move dir1B to be under dir2:
project root
|
+- dir1
| + dir1A
| + dir1C
|
+- dir2
+ dir1B
+ dir2A
+ dir2B
+ dir2C
I'm sure I didn't do things "the correct way". I think I did a "normal
move" rather than an "svn move" and then tried various permutations and
combinations of copy/move/add/scratch head/delete to "fix" things but
stuffed it up big time. Now if I try and do an update on dir1:
root> svn update dir1
I get:
svn: Working copy 'dir1' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for
details)
I then run
root> svn cleanup dir1
and get:
svn: In directory 'dir1'
svn: Error processing command 'modify-entry' in 'dir1'
svn: Error modifying entry for 'dir1B'
svn: 'dir1B' is not under version control
If, using Win Explorer, I look at dir1, I see that dir1B is NOT there,
it's sitting under dir2 as I placed it. I used Tortoise and fired up the
Repo-browser and it's also not under dir1 in the repository.
My question is how do I fix up dir1 so that it's "usable" once
again and I can once again Update? Any thoughts are greatly appreciated.
Regards,
Andrew Lowe
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Jan 10 17:04:17 2007