You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Wadsworth, Eric (Contractor)" <wa...@fhu.disa.mil> on 2003/07/30 16:35:40 UTC
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
Re: deleted directory that was "scheduled for addition"
Posted by Garrett Rooney <ro...@electricjellyfish.net>.
Wadsworth, Eric (Contractor) wrote:
> 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?
Try 'svn revert TacToLoaDate' to revert the add, then do your 'svn up'.
BTW, this question seems more suited to the new
users@subversion.tigris.org list than dev@subversion.tigris.org.
-garrett
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org