Re: Support for undelete from history?

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

> I'm wondering if there's a simple way to restore a directory that was
> deleted in the past. Right now, the only ways I think I can do this is to:
[...]
> method 2
> 1) create a branch/copy of the parent dir containing the removed dir
> 2) commit
> 3) merge the copy to trunk

That should work. You could also merge directly into a trunk wc.

> I tried a reverse merge:
> svn -r 218:217 <parentdir>
> and it looked like it was going to work. But unfortunately, in the same
> commit, I not only removed the directory by I also removed two files in that
> directory. The reverse merge looks like it'll work to add-back the
> directory, but I get 404 errors when svn tries to effectively reverse the
> file delete via an add b/c these files don't esit on the server.

Hmm, that appears to be an ra_dav bug. Using ra_local

svnadmin create repo
svn mkdir -m "" file://`pwd`/repo/foo
svn import -m "" svn-config file://`pwd`/repo/foo/bar
svn rm -m "" file://`pwd`/repo/foo
svn co file://`pwd`/repo wc
svn merge -r3:2 wc wc
A wc/foo
A wc/foo/bar

it works, and it also works over ra_svn. However ra_dav fails

rm -rf wc
svn co http://localhost/repo wc
svn merge -r3:2 wc wc
../svn/subversion/libsvn_ra_dav/util.c:408: (apr_err=175002)
svn: RA layer request failed
svn: PROPFIND request failed on 'http://localhost:8888/obj/repo/foo'
../svn/subversion/libsvn_ra_dav/util.c:81: (apr_err=175002)
svn: PROPFIND of 'http://localhost:8888/obj/repo/foo': 404 Not Found (http://localhost:8888)

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