Re: how to solve status ~ ?

Fraser Campbell wrote:
> I hate to beg but does anyone have a recommendation for how to get rid of the
> stuck directory so that I can begin using subversion again?
[...]
> On December 3, 2003 10:43 pm, Fraser Campbell wrote:
[...]
>>I am managing a server using subversion, basically I check in all configs
>>files and website content. I have the following output from svn status on
>>the root directory of the server:
>>
>>M home/sites/somwhere.com/web/index.html
>>~ usr
>>M etc/apache/domains/www.somewhere.com.conf
>>M etc/postfix/main.cf
>>
>>I previously had a situation like this and was advised to move the
>>offending directory and then run cleanup ... that's fine but in this case
>>the offending directory is actually /usr on a server that's 1.5 hours drive
>>from here.

OK, so don't move the directory, but you might need to run "svn cleanup" in the root directory. All that does is remove locks that have been left behind by a Subversion operation that was aborted by Ctrl-C etc., and you only need to do a "cleanup" if Subversion otherwise exits with an error saying that something is locked.

>>Is there any way (hopefully easy) to resolve this situation. I just want
>>subversion to forget that I ever told it to add usr, it's only in the
>>working copy not in the repository yet.

I think the command you want is "svn revert".

> cd /
> svn cleanup
> svn revert -R usr

If, as you say, "usr" has not yet been committed to the repository, then that should return "usr" to being unversioned.

If this fails, give us some more details such as the output of "svn status -v usr", "svn log -v usr", "svn list -v usr", and (non-svn) "ls -ld usr" (to show its permissions).

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 6 22:14:29 2003