Re: how to undo turning a directory into an external?

Ryan Schmidt wrote:
> If it's not exactly that problem, there is at least a similar one:
>
> http://subversion.tigris.org/issues/show_bug.cgi?id=2371

But if you'll follow my recipe, I commit the propdel before trying to restore
the directory, so the above bug won't happen.

> After the "svn ci" wouldn't an "svn up" have removed the dir, removing
> the need for the below steps?

No the directory won't be removed, merely marked as unversioned (this is a Good
Thing, as it prevents data loss). You must delete it or move it out of the way
before you can reverse merge the original delete (or else the files will
obstruct the merge, even if they are 100% identical).

> But if you were wanting to commit the removal of the svn:externals
> property and the return of the real dir as a single revision, as you
> might reasonably want to do, then manually removing dir would be necessary.

The point of #2371 is that you *cannot* remove an svn:external and replace it
with any versioned resource in the same commit.

John

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-09-18 11:44:05 CEST