You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Alex Turner <ar...@gmail.com> on 2006/03/25 17:00:21 UTC
Trying to recover a Deleted Directory
I deleted a directory by accident (and committed - svn seemed to get quite
confused by what I was doing), and I'm trying to recover it, but I can't
figure out how to make svn merge work right. I get a cryptic message:
[foo@maple W.5-6.p5]$ svn merge -r48:46
/data/httpd/vhosts/mydomain.com/httpdocs/lesson_plan
Skipped missing target: 'footer.php'
Skipped 'Weather_and_Climate/5-6/W.5-6.p5'
svn: Working copy 'Weather_and_Climate/5-6' is missing or not locked
[foo@maple W.5-6.p5]
Please help, I just trashed a whole directory, and I really need to get it
back!!
Thanks,
Alex
Re: Trying to recover a Deleted Directory
Posted by Blair Zajac <bl...@orcaware.com>.
Alex Turner wrote:
> This does looks more like what I was looking for.
>
> Oddly I ended up checking out the files from the relavent revision into
> another directory, then copying them into the appropriate place. svn
> checkout svn://localhost/blah@46 didn't work, it gave me revision 48, I
> had to specify the -r tag to get the revision I wanted.
This sounds like you may have lost the history of the files though, if the copy
you mention was not a subversion copy.
You really want to just revert the merge using something like 'svn merge -r
N:N-M', where M > 0 and takes you back where you want to go.
Regards,
Blair
--
Blair Zajac, Ph.D.
<bl...@orcaware.com>
Subversion training, consulting and support
http://www.orcaware.com/svn/
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Trying to recover a Deleted Directory
Posted by Alex Turner <ar...@gmail.com>.
This does looks more like what I was looking for.
Oddly I ended up checking out the files from the relavent revision into
another directory, then copying them into the appropriate place. svn
checkout svn://localhost/blah@46 didn't work, it gave me revision 48, I had
to specify the -r tag to get the revision I wanted.
Alex.
On 3/25/06, Ryan Schmidt <su...@ryandesign.com> wrote:
>
> Craig, yes, he can "svn co" the older revision or "svn up" his
> working copy to that revision, but then he can't commit it because
> it's not HEAD. I interpreted that he wanted to bring it back into
> HEAD, so:
>
> Alex, you can always copy the old version back in to your working copy:
>
> cd working/copy/of/lesson_plan
> svn cp url://to/repo/Weather_and_Climate@46 .
> svn ci -m "Bringing Weather_and_Climate back from r46"
>
> I may have the paths and revisions wrong; you'll have to know what
> path you deleted and what revision it was last available in, but that
> should help with the syntax anyway.
>
Re: Trying to recover a Deleted Directory
Posted by Ryan Schmidt <su...@ryandesign.com>.
Craig, yes, he can "svn co" the older revision or "svn up" his
working copy to that revision, but then he can't commit it because
it's not HEAD. I interpreted that he wanted to bring it back into
HEAD, so:
Alex, you can always copy the old version back in to your working copy:
cd working/copy/of/lesson_plan
svn cp url://to/repo/Weather_and_Climate@46 .
svn ci -m "Bringing Weather_and_Climate back from r46"
I may have the paths and revisions wrong; you'll have to know what
path you deleted and what revision it was last available in, but that
should help with the syntax anyway.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Trying to recover a Deleted Directory
Posted by Craig White <cr...@azapple.com>.
Read Note #3 at the bottom of the page.
Craig
On Sat, 2006-03-25 at 12:24 -0500, Alex Turner wrote:
> Revert only reverts something that wasn't committed. This change has
> been comittted.
>
> Alex
>
> On 3/25/06, Craig White <cr...@azapple.com> wrote:
> http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.examine.revert
>
> Craig
>
> On Sat, 2006-03-25 at 12:16 -0500, Alex Turner wrote:
> > Thanks, how do I do that?!
> >
> > Alex
> >
> > On 3/25/06, Craig White <cr...@azapple.com> wrote:
> > On Sat, 2006-03-25 at 12:00 -0500, Alex Turner
> wrote:
> > > I deleted a directory by accident (and committed -
> svn
> > seemed to get
> > > quite confused by what I was doing), and I'm
> trying to
> > recover it, but
> > > I can't figure out how to make svn merge work
> right. I get
> > a cryptic
> > > message:
> > >
> > > [foo@maple W.5-6.p5]$ svn merge
> > >
> -r48:46 /data/httpd/vhosts/mydomain.com/httpdocs/lesson_plan
> > > Skipped missing target: ' footer.php'
> > > Skipped 'Weather_and_Climate/5-6/W.5- 6.p5'
> > > svn: Working copy 'Weather_and_Climate/5-6' is
> missing or
> > not locked
> > > [foo@maple W.5-6.p5 ]
> > >
> > >
> > > Please help, I just trashed a whole directory, and
> I really
> > need to
> > > get it back!!
> > >
> > ----
> > try to revert to a previous version.
> >
> > Craig
> >
> >
> >
> ---------------------------------------------------------------------
> > To unsubscribe, e-mail:
> > users-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail:
> > users-help@subversion.tigris.org
> >
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail:
> users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Trying to recover a Deleted Directory
Posted by Alex Turner <ar...@gmail.com>.
Revert only reverts something that wasn't committed. This change has been
comittted.
Alex
On 3/25/06, Craig White <cr...@azapple.com> wrote:
>
>
> http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.examine.revert
>
> Craig
>
> On Sat, 2006-03-25 at 12:16 -0500, Alex Turner wrote:
> > Thanks, how do I do that?!
> >
> > Alex
> >
> > On 3/25/06, Craig White <cr...@azapple.com> wrote:
> > On Sat, 2006-03-25 at 12:00 -0500, Alex Turner wrote:
> > > I deleted a directory by accident (and committed - svn
> > seemed to get
> > > quite confused by what I was doing), and I'm trying to
> > recover it, but
> > > I can't figure out how to make svn merge work right. I get
> > a cryptic
> > > message:
> > >
> > > [foo@maple W.5-6.p5]$ svn merge
> > > -r48:46 /data/httpd/vhosts/mydomain.com/httpdocs/lesson_plan
> > > Skipped missing target: 'footer.php'
> > > Skipped 'Weather_and_Climate/5-6/W.5- 6.p5'
> > > svn: Working copy 'Weather_and_Climate/5-6' is missing or
> > not locked
> > > [foo@maple W.5-6.p5]
> > >
> > >
> > > Please help, I just trashed a whole directory, and I really
> > need to
> > > get it back!!
> > >
> > ----
> > try to revert to a previous version.
> >
> > Craig
> >
> >
> >
> ---------------------------------------------------------------------
> > To unsubscribe, e-mail:
> > users-unsubscribe@subversion.tigris.org
> > For additional commands, e-mail:
> > users-help@subversion.tigris.org
> >
> >
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
Re: Trying to recover a Deleted Directory
Posted by Craig White <cr...@azapple.com>.
http://svnbook.red-bean.com/nightly/en/svn.tour.cycle.html#svn.tour.cycle.examine.revert
Craig
On Sat, 2006-03-25 at 12:16 -0500, Alex Turner wrote:
> Thanks, how do I do that?!
>
> Alex
>
> On 3/25/06, Craig White <cr...@azapple.com> wrote:
> On Sat, 2006-03-25 at 12:00 -0500, Alex Turner wrote:
> > I deleted a directory by accident (and committed - svn
> seemed to get
> > quite confused by what I was doing), and I'm trying to
> recover it, but
> > I can't figure out how to make svn merge work right. I get
> a cryptic
> > message:
> >
> > [foo@maple W.5-6.p5]$ svn merge
> > -r48:46 /data/httpd/vhosts/mydomain.com/httpdocs/lesson_plan
> > Skipped missing target: 'footer.php'
> > Skipped 'Weather_and_Climate/5-6/W.5- 6.p5'
> > svn: Working copy 'Weather_and_Climate/5-6' is missing or
> not locked
> > [foo@maple W.5-6.p5]
> >
> >
> > Please help, I just trashed a whole directory, and I really
> need to
> > get it back!!
> >
> ----
> try to revert to a previous version.
>
> Craig
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail:
> users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail:
> users-help@subversion.tigris.org
>
>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Trying to recover a Deleted Directory
Posted by Alex Turner <ar...@gmail.com>.
Thanks, how do I do that?!
Alex
On 3/25/06, Craig White <cr...@azapple.com> wrote:
>
> On Sat, 2006-03-25 at 12:00 -0500, Alex Turner wrote:
> > I deleted a directory by accident (and committed - svn seemed to get
> > quite confused by what I was doing), and I'm trying to recover it, but
> > I can't figure out how to make svn merge work right. I get a cryptic
> > message:
> >
> > [foo@maple W.5-6.p5]$ svn merge
> > -r48:46 /data/httpd/vhosts/mydomain.com/httpdocs/lesson_plan
> > Skipped missing target: 'footer.php'
> > Skipped 'Weather_and_Climate/5-6/W.5-6.p5'
> > svn: Working copy 'Weather_and_Climate/5-6' is missing or not locked
> > [foo@maple W.5-6.p5]
> >
> >
> > Please help, I just trashed a whole directory, and I really need to
> > get it back!!
> >
> ----
> try to revert to a previous version.
>
> Craig
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
Re: Trying to recover a Deleted Directory
Posted by Craig White <cr...@azapple.com>.
On Sat, 2006-03-25 at 12:00 -0500, Alex Turner wrote:
> I deleted a directory by accident (and committed - svn seemed to get
> quite confused by what I was doing), and I'm trying to recover it, but
> I can't figure out how to make svn merge work right. I get a cryptic
> message:
>
> [foo@maple W.5-6.p5]$ svn merge
> -r48:46 /data/httpd/vhosts/mydomain.com/httpdocs/lesson_plan
> Skipped missing target: 'footer.php'
> Skipped 'Weather_and_Climate/5-6/W.5-6.p5'
> svn: Working copy 'Weather_and_Climate/5-6' is missing or not locked
> [foo@maple W.5-6.p5]
>
>
> Please help, I just trashed a whole directory, and I really need to
> get it back!!
>
----
try to revert to a previous version.
Craig
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org