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

RE: Re: dir is already under version control?

From: Matthew Janulewicz <Matthew.Janulewicz_at_nextestate.com>
Date: 2005-12-13 19:34:09 CET

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.

Since nobody else is offering much help, I'll give you my own cockamamie idea to get this going. If, in fact, you aim to make a new, empty, completely different directory named 'repository', I would go about the 'normal' method to resurrect the old directory in-tact (which I believe involves merging the revision before the delete back up to HEAD), then remove all the files in it.

Other tools like Perforce and ClearCase allow this kind of thing without giving it a second thought, but it can get pretty dicey. You basically end up with a branch/line of code, further complicated by the fact that it is a directory with other stuff in it, that has a break in the middle. In those tools it has the potential to really wreck your merging and makes the history of that directory, and both sets of files in it (the old and the new) look really unnatural, for lack of a better word.

That's my two cents. I'm sure there's a better way to do it, but I'm not smart enough to figure it out just yet. Maybe someone else on the list can respond, or maybe this idea is good enough.

-Matt

-----Original Message-----
From: Bjørn T Johansen [mailto:btj@havleik.no]
Sent: Tuesday, December 13, 2005 9:09 AM
To: Kjell H Andersen
Cc: users@subversion.tigris.org
Subject: Re: dir is already under version control?

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??
>>
>>
>> Regards,
>>
>> BTJ
>>
>>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 13 20:38:11 2005

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