On 10/13/2009 5:35 PM, Ryan Schmidt wrote:
> On Oct 13, 2009, at 17:46, John Calcote wrote:
>> A committer in one of my projects deleted a directory in the project.
>> Then, realizing the mistake, added it back in from a working copy he had
>> on his hard drive. This effectively wiped out the history on every file
>> in that directory. Now, I'd like to put it back with history. Here's
>> what I try to do:
>> $ svn copy https://localhost/svnroot/projectx/trunk/mydir@305 .
>> svn: Path 'mydir' already exists
>> If I try to delete mydir and then repeat the operation, I get an error
>> that the working copy is locked. If I delete mydir and run svn cleanup
>> first, then run the copy command, I still get the error that the working
>> copy is locked.
>> Help! The manual shows how to do this for a single file, but it doesn't
>> discuss the nuances of doing it with a complete directory. Nor does it
>> discuss what to do if the directory exists because it was recreated in a
>> later revision.
> You will probably need to delete the incorrectly-copied directory,
> commit, copy it correctly using the peg revision syntax you showed
> above, commit again.
> Don't know why you got a message that the wc was locked. Are you
> running the latest version of Subversion?
You know, that's sort of what I figured, but I wanted a little feedback
before a committed garbage before the good stuff. :)
I'm sorry I didn't post my svn client version. I meant to, but spaced
it. This is an opensuse 11.1 Linux box, and it's still the one that
comes with it: 1.5.7. However, I tried it with 1.6.5 and it has the same
Thanks for the advice. I'll delete/commit/copy/commit. I've got a
feeling that will work fine.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_subversion.tigris.org].
Received on 2009-10-14 06:21:23 CEST