> > > -----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 between
>
> $ svn merge -r N:N-1 URL-to-repos-root .
>
> and
>
> $ 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?
Yes, but I was thinking about URL to deleted dir's parent ... see below.
> > 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?
Util is the parent of the directory that I wanted to restore.
I think my problem is primarily that I keep thinking like a long term
clearcase user...to add, remove, or rename elements, you modify the parent
directory, make the changes to its contents, then check it in with any
changes underneath it. Since I'm pretty new to subversion and not entirely
in the right mindset, when things haven't worked as I expected in directory
operations, I've tried both working on the file in question and it's parent.
I'm all squared away now. Thanks Philip and Ben.
Evan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Tue Jul 1 20:07:53 2003