On Dec 16, 2005, at 12:41, Grégoire Welraeds wrote:
> Today when trying to commit some changes in a wc, one of the
> developer here received the following error message:
> Error: Failed to add directory '<directory A>': object of the same
> name is already scheduled for addition
> Now I have 2 questions:
>
> - Does someone have a clue about how it did happened (the developer
> is clueless...) ?
> The only think I saw is the case-sensitive/insensitive situation
> for wc under windows. I have already setup the check-case-
> sensitive.pl hook script for the future.
So presumably your developer wanted to add <directory A> but someone
else already checked in, for example, <directory a>. Use svn ls or
your favorite repository browsing tool to confirm if <directory a>
already exists in the repository.
> - What can I do to recover the situation. I know I could delete
> everything under <directory A>'s parent and do a svn co of the
> directory but ideally, I do not want to do that because there are a
> lot of file under the parent directory of <directory A> and the
> developer has several files updated that he do not want to commit
> immediately. Is there any other way to recover. I've already
> performed a revert on the directory which lead me to run a cleanup,
> but an update or a commit still returns the same error message.
You can read this and see if it helps:
http://subversion.tigris.org/faq.html#case-change
But perhaps you could tell us: what is the desired end result?
Did your developer make a mistake -- should he have been using the
existing <directory a> instead of making a new <directory A>? If so,
then you can svn revert the addition of <directory A> so that it is
not scheduled for addition to the repository. Then you can rename
<directory A> to <directory foo>. Then you can update the working
copy to receive the <directory a> already in the repository. Then you
can manually move added files from <directory foo> to <directory a>
and svn add them as needed. Then you can commit that.
Or did you want to use your developer's <directory A> and discard the
<directory a> already in the repository? If so, you can simply use
svn rm on the complete repository URL of <directory a> and delete it
without a working copy. Then the addition of <directory A> will not
fail.
If neither of these are what you wanted to do, then tell us what you
wanted to do and maybe we can help.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sun Dec 18 18:08:28 2005