stuck state, loosing data because I can't commit, help....

Hi,

How do I get around this problem?

1) I checkout the following directory tree:

one\

one\subone.txt

one\two\

one\two\subtwo.txt

2) I edit: one\subone.txt

3) I delete the dir: one\two\

4) Now I cannot commit the changes made inside of "one\subone.txt", Instead
I get an error message:

svn: Commit failed (details follow):

svn: Working copy 'C:/test/one/two' not locked

5) So I think, hmm maybe svn cleanup will help? But then I get this error
message:

svn: 'two' is not a working copy directory

6) In frustration I try to commit again, but now I get this different error
message:

svn: Working copy 'C:\test\one' locked

svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)

7) svn cleanup still doesn't help

8) Here's what my svn status looks like:

  L C:\test\one

~ C:\test\one\two

So, what do I have to do to be able to commit the changes made to the file
"one\subone.txt" under these conditions?

Thanks,

-Steffen

 
Received on Fri Feb 27 17:24:01 2004