Problem ressurectiing a project trunk

[David Balch <da...@continuing-education.oxford.ac.uk>]

Hi,

I'm having a problem resurecting a directory that was mistakenly deleted.
At rev 483, the project "short-courses" is in my repository, with branches,
tags and trunk subdirectories.

Rev483:
 short-courses
  + branches
  + tags
  + trunk

Somehow, the trunk got deleted in the next revision. No changes have been
committed since then.

Rev484 (HEAD):
 short-courses
  + branches
  + tags

Looking at the book [0], copying the trunk from the previous revision looks
like the way to go, but svn tells me the working copy is locked - even
though it's a fresh checkout. Here's what happens:

-----------EXAMPLE START-----------

BalchD@rowlf /cygdrive/d/wc
$ svn co svn://bongo/subversion/short-courses short-courses
<SNIP FOR BREVITY>
Checked out revision 484.

BalchD@rowlf /cygdrive/d/wc
$ cd short-courses

BalchD@rowlf /cygdrive/d/wc/short-courses
$ svn cp -r483 svn://bongo/subversion/short-courses/trunk ./trunk
svn: Working copy '.' locked
svn: run 'svn cleanup' to remove locks (type 'svn help cleanup' for details)

-----------EXAMPLE END-----------

At this point it has created a "trunk" directory, but isn't sure whether
it's in ther repository or not:

-----------EXAMPLE START-----------

BalchD@rowlf /cygdrive/d/wc/short-courses
$ svn info trunk/
Path: trunk
URL: svn://bongo/subversion/short-courses/trunk
Repository UUID: 40e514c9-7dcd-b44f-87da-b444ffc43b05
Revision: 483
Node Kind: directory
Schedule: normal

BalchD@rowlf /cygdrive/d/wc/short-courses
$ svn st trunk/
?      trunk

-----------EXAMPLE END-----------

Any ideas why this isn't working?

I'm using Subversion 1.0.9 via Cygwin on WinXP SP2

[0] http://svnbook.red-bean.com/svnbook-1.0/svn-book.html#svn-ch-4-sect-4.3

Cheers,
Dave.

-- 
David Balch.          | Web developer.
T: +44 (0)1865 286932 | Technology-Assisted Lifelong Learning.
F: +44 (0)1865 286922 | University of Oxford.
E: david.balch@conted.ox.ac.uk

TALL, OUDCE and the University of Oxford accept no legal responsibility for
the contents of this message. Any views or opinions presented are only those
of the author and not those of TALL, or OUDCE, or the University of Oxford.
If this email has come to you in error please delete it and any attachments


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

Re: Problem ressurectiing a project trunk

[Dominic Anello <da...@danky.com>]

On 2004-10-26 11:45:29 +0100, David Balch wrote:
> Hi,
> 
> I'm having a problem resurecting a directory that was mistakenly deleted.
> At rev 483, the project "short-courses" is in my repository, with branches,
> tags and trunk subdirectories.
> 
> Rev483:
>  short-courses
>   + branches
>   + tags
>   + trunk
> 
> Somehow, the trunk got deleted in the next revision. No changes have been
> committed since then.
> 
> Rev484 (HEAD):
>  short-courses
>   + branches
>   + tags
> 
> Looking at the book [0], copying the trunk from the previous revision looks
> like the way to go, but svn tells me the working copy is locked - even
> though it's a fresh checkout. Here's what happens:
----8<----

Try just doing the following:
svn cp -r 483 http://server/short-courses/trunk http://server/short-courses -m "Restoring /trunk"

Replace http://server with whatever the appropriate access method is for
your repo.

-Dominic

-- 
Current soundtrack: 'Muddy Waters - Fathers And Sons - 2 - Mean
Disposition'