undelete?

What's the easiest way to undelete stuff in a tree? I just did a merge
of a snapshot from an upstream source and they deleted a whole directory
of code which I would like to resurrect in my working tree. I'm
considering doing an "svn cp" from the previously tagged snapshot but I
was wondering if there is a more "correct" method.

In general it would be nice to know if there was a way to selectively
'undo' changes from past commits. My first instinct was to use merge
but when I tried it I got an obscure error message:

    $ svn merge -r 178:176 https://svnserver/svn/branches/project/tmp2/dir

    svn: REPORT request failed on '/svn/!svn/vcc/default'
    svn: REPORT of '/svn/!svn/vcc/default': Could not read chunk size:
    Secure connection truncated (https://svnserver)

This command was executed from the working copy at project/tmp2 and
'dir' is the directory I was trying to selectively recover. 'dir'
exists in version 176 but was deleted for 178 (which is the HEAD).

I've also tried this on single files with similar results.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Mar 18 22:35:42 2004