Question

I recently did a svn add Foo/ which failed because there was a file (not a directory) called Foo/.svn

Without really thinking, I did rm Foo/.svn; svn add Foo/

This fails because “Foo is already under version control”, although svn status shows

~ Foo

instead of

A Foo

I can’t svn commit because of this. svn add --force Foo/ doesn’t help.

How can I fix this?

Answer 1

If you Ack the content of .svn for Foo, you can see it in entries. This means it has been somewhat saved inside Svn local db, even if it failed to put its .svn db inside Foo.

An svn revert Foo forces Svn to remove it from its entries.

If you ask now for the status, your directory would be

?       Foo

You can then retry to svn add it and it will work.