Problem deleting file, then parent directory

I can't TortoiseSVN Delete a directory after I have TortoiseSVN Deleted a file from that directory. More precisely, I can TortoiseSVN Delete the directory, but I can't SVN Commit the deletion.

I created a new work folder, called workdir, and updated it with a new, empty repository. In workdir, I create a folder named dir1, and in dir1 I create file1 and file2. So my work directory looks like this:

workdir
-- dir1
---- file1
---- file2

I right-click on dir1, and TortoiseSVN Add it to the repo. Then I SVN Commit workdir.

Next I go into dir 1 and TortoiseSVN Delete file1. I SVN Commit workdir.

In workdir, I right-click on dir1 and TortoiseSVN Delete the directory, which still contains file2. I go back up a level and right-click on workdir, click SVN Commit, and I get the following error:

testrepo - Commit - TortoiseSVN Failed!
Action | Path
Command | Commit
Deleting | C:\test\workdir\dir1
Error | Commit failed (details follow):
Error | Directory '/dir1' is out of date
Error | You have to update your working copy first.
Finished!

If I try an SVN Update at that point, I get this:

C:\test\workdir - Update - TortoiseSVN Finished!
Action | Path
Command | Update
Tree conflict | C:\test\workdir\dir1
Completed | At revision: 5
Warning! | One or more files are in a conflicted state.

This seems wrong. Since I already committed my deletion of file1 from the repository, there should be no tree conflict and no reason I can't commit the deletion of dir1.

  Richard

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2643642

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-08-06 11:40:49 CEST