[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: recovering from the attic
From: |
Mark D. Baushke |
Subject: |
Re: recovering from the attic |
Date: |
Mon, 21 Jul 2003 12:33:49 -0700 |
<address@hidden> writes:
> Hi All;
> I have run into a problem that some people deleted some files that
> they want back. The files are in the attic so I figure this is
> easy, they just have to add them back in and commit. Well it
> didn't quite work out that way. When I run cvs add <filename> I
> get the message from cvs that it is recovering file version and to
> commit. I commit and I see the file just find. I do a log the file
> and the file version numbers are correct. When I open the file, it
> is blank. If I do a cvs update -r <previous version that was
> deleted> <filename> I get the file I expect, but when I do a
> status cvs says the file is up to date. So how do I get a deleted
> file back from the attic without the file being blank. These are
> text files by the way.
The 'cvs update -r <previous version that was deleted> <filename>'
created a sticky tag on the file which is not what you want in this
case.
Given that <filename> is foo.c and if the 'state: dead' revision is
version 1.27 and you would like to see version 1.26 back in place you
can do it a few different ways
cvs add foo.c
cvs up -p -r1.26 foo.c > foo.c
...verify it works as you expect...
cvs commit foo.c
or
cvs up -j1.27 -j1.26 foo.c
...verify it works as you expect...
cvs commit foo.c
now there should be a new 1.28 version that is no longer in the Attic.
See also http://www.cvshome.org/docs/manual/cvs-1.12.1/cvs_5.html#SEC62
Enjoy!
-- Mark