On Sep 17, 2008, at 04:26, John Peacock wrote:
> 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,
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 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
After the "svn ci" wouldn't an "svn up" have removed the dir,
removing the need for the below steps?
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.
> # 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.
---------------------------------------------------------------------
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 07:15:10 CEST