How to get out of mess?

I managed to create a mess. I've gone at least a month without doing something like this, but I've done it before.

I'm not sure what I did. I was in Solution Explorer of VS2008. I probably moved a folder by mistake to another folder within the same project. I also have VisualSVN installed.

Anyway, by the time I noticed what I had done, I could not move the folder from the place I had erroneously moved (probably copied) it to its original position. When I tried, the IDE said that there was a folder which existed with that same name (of course, in the original position, so I must have copied it). But TortoiseSVN recorded the new position with adds, and deletes on the original position in the Check for Modifications dialog.

Out of frustration and ignorance, I renamed the original folder from "folder" to "folderA", created a new "folder", copied the files from "folderA" to "folder" and deleted "folderA". When I try to add the new "folder" to TSVN, it says "Directory E:\.....\.svn containing working copy admin area is missing. Please execute "Cleanup" command". When I tried to do this, TSVN says, "Failed to cleanup the following paths:Directory E:\.....\".

If I try to Update the solution to the WC, it says the a project is locked, please execute the Cleanup command.

Any way out of this? I'd like to learn how to get out of, or better yet, not get into, situations like this.

Thanks, Lars

      
Received on 2008-08-13 02:48:15 CEST