deleted directory that was "scheduled for addition"

I've painted myself into a corner, and I need to find a way out:

On working copy #1 (wc1) I decided that I needed to add a subdirectory with
some files in it. So I used the "svn add" command to do so. When I did "svn
ci" it complained, and I realized that this subdirectory had already been
added previously, from another working copy (wc2). Obviously, I should have
done an "svn up" prior to this, but there were some things in other
subdirectories that I couldn't at that time update. So, in an attempt to fix
my situation, I deleted the offending subdirectory on wc1, not using the svn
command, just removing it from the filesystem. I had hoped that "svn up"
would then restore it properly... alas, no, I get this:

svn: Obstructed update
svn: failed to add dir 'TacToLoaDate':
object of the same name is already scheduled for addition

Now what do I do?

Thanks in advance! --- Eric

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Jul 30 18:36:42 2003