[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: dir is already under version control?

From: Mathias Weinert <mathias.weinert_at_gfa-net.de>
Date: 2005-12-14 08:55:55 CET

"Matthew Janulewicz" <Matthew.Janulewicz@nextestate.com> wrote:

> I might be an idiot, and I've been off the Subversion tip for a few months, but I think Subversion is getting confused because that directory *does* exist in the (history of) the repo, so you can't add it again. If you go back to the revision of the repo prior to the delete, there it is. I think this is (at least in a philosophical, on paper way) creating the conflict.
>

I don't think that Subversion will refuse to add a directory
with the name of a formerly deleted one - and I don't dare
to say anything about your first point ;-).

As Kjell said, normally it should be enough to update
the working copy (invoke the update command from the parent
directory of the one in which you deleted the 'repository'
directory - if possible). If this doesn't help you could
try the following:
- run 'svn update -r rev' where rev is the revision before
you deleted the directory 'repository'
- run 'svn update'

If this also doesn't help, I suggest
to do a new checkout of the working copy.

In detail:
- If you have any local changes, backup them
(or back them up - whatever you like ;-) )
- If the parent directory of the deleted one is not the root
directory of your working copy delete it and do an 'svn update'
from the next higher parent directory
If the problem occured in the root directory of the working
copy completely remove it and do a fresh checkout with
'svn checkout'
- Apply your previously backuped local changes

Hope any of my hints will help you

Mathias

remove this part of the working copy

[...]
>
> Yes, I tried that... But I still get the same warning...
>
> BTJ
>
> Kjell H Andersen wrote:
> > did you try to run "svn update" after you commit?
> > It usually helps when I get that kind of problems
> >
> > K
> >
> > Bjørn T Johansen wrote:
> >> I have just ran "svn del repository" and "svn commit" for a directory
> >> and everything worked fine...
> >> But when I try to create a directory with the same name an put it
> >> under svn control, I just get
> >>
> >> svn: warning: 'repository' is already under version control
> >>
> >> and if I run svn status, I get..:
> >>
> >> ? repository
> >>
> >> as expected...
> >>
> >>
> >> How can I add my directory??
> >>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 14 08:59:57 2005

This is an archived mail posted to the Subversion Users mailing list.