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

Re: Support for undelete from history?

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2003-07-01 19:03:26 CEST

"eeaston.com" <evan@eeaston.com> writes:

> > -----Original Message-----
> > From: sussman@collab.net [mailto:sussman@collab.net]
> > ...
> > But for the record, the simplest way to "restore" a deleted object is
> > to just use 'svn cp -r oldrev URL wc'. This sucks down the deleted
> > item into the working copy and schedules it for addition-with-history.
> Except won't this restore the entire contents of the parent's old revision
> rather just undoing the element deletion?

If revision N deleted a directory, then there is *no* difference

  $ svn merge -r N:N-1 URL-to-repos-root .


  $ svn cp -r N-1 URL-to-deleted-directory .

Both things end up doing the exact same thing: the directory (as it
looked in revision N-1) will be copied into your working copy and
scheduled for addition-with-history.

Isn't this what you want?

> BTW, I swear I tried this already...so I tried it again. If I run this
> command on the parent dir using dav, I get the following:
> ...\eeaston> svn cp -r 217
> http://localhost:81/migratedrepo/trunk/casetracker/src/com/eeaston/util .
> svn: Obstructed update
> svn: `util' is in the way

How can 'util' be in the way? Why does 'util' exist in your working
copy? Wasn't it deleted?

> And if I run it on the deleted directory itself using dav, I get the
> following:
> ...\eeaston>cd util
> ...\util>svn cp -r 217
> http://localhost:81/migratedrepo/trunk/casetracker/src/com/eeaston/util/xml
> xml
> svn: RA layer request failed
> svn: PROPFIND request failed on
> 'http://localhost:81/migratedrepo/trunk/casetracker/src/com/eeaston/util/xml
> '
> svn: PROPFIND of
> 'http://localhost:81/migratedrepo/trunk/casetracker/src/com/eeaston/util/xml
> ': 404 Not Found (http://localhost:81)
> It turns out that doing the reverse merge with file: URLs works. This is a
> pretty rare scenario, so I think I can get by doing this for the time being.

This is issue 1370; it only fails over DAV, as you say.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 1 19:05:00 2003

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.