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

Robert P. J. Day wrote:
> is/was there an issue with simply undoing that kind of operation? if
> it's worth the time, i can try it all again on a throwaway branch and
> record the results. thanks.

No, there isn't a problem with undoing that kind of operation, but you have to
move obstructing files out of the way. Here is the sequence that you probably
should have followed:

# deleting the original path, you might need a commit before the propset
svn rm dir
svn ps svn:externals http://other/server/path dir
svn ci

# Here you discovered that everything was not OK, so unset the externals
svn pd svn:externals dir
svn ci

# This is the step you skipped, get the old files out of the way
mv dir /tmp/dir

# this will undo the 'svn rm dir' above, note this URL is the parent of dir
svn merge -c-999 http://path/to/original/url
svn ci

NOTE that this is from memory (not actually tested in this sequence), but should
be accurate (or close to it). The issue is that you have to both commit the
propdel (so the WC doesn't have any record of a directory being there) *AND*
move the now unversioned directory/files out of the way.

HTH

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-17 11:27:18 CEST