You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Aidan Fitzpatrick <ai...@lothianproductions.co.uk> on 2004/08/09 15:09:22 UTC

RE: Resurrecting directories not working?

 
Sorry, I should have specified:

# svn --version
svn, version 1.0.6 (r10360)
   compiled Jul 19 2004, 21:53:24

(From an RH9 binary RPM. I upgraded from 1.0.3 after getting the same
problem.)

-----Original Message-----
From: Aidan Fitzpatrick [mailto:aidan@lothianproductions.co.uk] 
Sent: 09 August 2004 16:00
To: 'users@subversion.tigris.org'
Subject: Resurrecting directories not working?

 
The folder Application/ApExplorer was erroneously been deleted our
repository in revision 115. We're now on revision 117.
 
The SVN book suggests -- at http://svnbook.red-bean.com/svnbook/ch04s04.html
-- that by using the `svn copy` command one can copy back in a deleted
revision for a file or directory.
 
I just can't get it to work. I've copied below the commands that I've used,
but don't understand why I'm repeatedly getting the errors that I do. I've
deleted and rechecked out a number of times, just in case. I've tried
searching the Tigris.org mailing list but it keeps giving me Servlet errors.
("Message not available: 48843", etc.)

No doubt I'm doing something stupid. Any advice would be greatly
appreciated.
A

--
 
# cd Application
# svn up
At revision 117.
# svn copy --revision 114
svn+ssh://localhost/opt/svn/co/trunk/Source/Application/ApExplorer .
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
# svn status
?      ApExplorer
# cd ..
# svn status
?      Application/ApExplorer
# cd Application
[Note how nothing is marked 'L'ocked...]

# svn help cleanup
[etc., not much use]
# svn cleanup
# svn copy --revision 114
svn+ssh://localhost/opt/svn/co/trunk/Source/Application/ApExplorer .
svn: 'ApExplorer' is in the way
[Ngh.]
# svn status
?      ApExplorer
[Ngh!]
# rm -rf ApExplorer
 
[Right, so try again, clean first this time...] # svn up && svn cleanup At
revision 117.
# svn copy --revision 114
svn+ssh://localhost/opt/svn/co/trunk/Source/Application/ApExplorer .
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)

[Try again from a parent folder?]
# rm -rf ApExplorer
# cd ..
# svn up && svn cleanup
At revision 117.
# svn copy --revision 114
svn+ssh://localhost/opt/svn/co/trunk/Source/Application/ApExplorer
Application/
svn: Working copy 'Application' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)
# svn status
?      Application/ApExplorer
[FFS!]
 
[Try again, with specifying folder name instead of PWD:] # cd Application #
rm -rf ApExplorer # svn up && svn cleanup At revision 117.
# svn copy --revision 114
svn+ssh://localhost/opt/svn/co/trunk/Source/Application/ApExplorer
ApExplorer A  ApExplorer/ApExplorer/files Checked out revision 114.
A         ApExplorer/ApExplorer
[Ngh. As I expected, two levels deep...]



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

RE: Resurrecting directories not working?

Posted by Ben Collins-Sussman <su...@collab.net>.
On Mon, 2004-08-09 at 10:09, Aidan Fitzpatrick wrote:
>  Sorry, I should have specified:
> 
> # svn --version
> svn, version 1.0.6 (r10360)
>    compiled Jul 19 2004, 21:53:24

I'm using a 1.1.0rc1 client on RH9, and can't reproduce this problem at
all, either over file:/// or svn+ssh://.  Can you try to reproduce with
a 1.1 client?

-------------------------------------------------

(In my example, I deleted the 'zenirc' directory in r2.)

$ svn co svn+ssh://localhost/home/sussman/scratch/repos wc
sussman@localhost's password:
A  wc/priority.el
A  wc/psgml
[...]
A  wc/friedman-twiddle.el
Checked out revision 2.
 
$ cd wc

$ svn copy -r1 svn+ssh://localhost/home/sussman/scratch/repos/zenirc .
sussman@localhost's password:
A  zenirc/zenirc-18.elc
A  zenirc/zenirc-dcc.elc
[...]
A  zenirc/zenirc-stamp.elc
Checked out revision 1.
A         zenirc

$ svn st
A  +   zenirc




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