svn folder show up on svn ls but isn't in my repository

Question

I have messed up the order of deleting locally, svn delete, and commit (something in there went wrong), and now a folder shows up in my 'svn ls' in my checkout directory, that isn't actually on the repository. If I try to reuse that folder name, svn won't commit any files in the folder. It will give me the following error message:

svn: File already exists: filesystem '/repos/svn/****/db', transaction '64-28', path '/portable_robot/ur5_moveit'

It would be very helpful to use that name, because it is a specific application in my program. How so I clean up my local svn tree?

Answer 1

Given what you've described, I'd say you have two choices:

First, you could svn revert your checkout directory (or parts of it). This would remove all local changes in the directory (or directories) you specify. Then you could work through the delete, commit, add, etc. steps to get your directory cleaned up.

Second, you could checkout a new copy in a new directory and make your changes there ensuring that each step works.