On Saturday 06 December 2003 09:04, 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?
>
> Thanks!
>
> On December 3, 2003 10:43 pm, Fraser Campbell wrote:
> > Hi,
> >
> > 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.
In general that's the approach you want to take. '~' means that there is an
obstruction, i.e., an unversioned file or directory that has the same name as
a versioned resource.
> > 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 had wanted to add /usr/something/ at somepoint but forgot to use the -N
> > option when adding. I believe I made the mistake of cancelling the
> > command (CRTL-C) instead of reverting (wish I could remember).
In general when you do an add, and you want to undo it, you would use 'svn
revert'. Unfortunately, it looks like you're now missing .svn/ directories
that should be in usr/ and have caused this obstruction problem.
Currently, I don't think there is any command we can use to remove the problem
directory from version control without moving the directory in question, and
then doing an 'svn revert'. This problem might make the case for having an
option for 'revert' that goes ahead and unschedules the directory anyway (a
--force option of sorts).
In order to avoid propagating misuse of the tool, I'm going to send you a
solution to his problem in a private email. I'd like to see a solution that
addresses this situation in the future since it seems that there are a number
of people who have been versioning their systems, and may face the same
problem of being unable to remove this resource from version control without
moving the obstruction.
-John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Dec 6 16:30:12 2003