[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Delete file / undelete, problems
From: |
Eric Siegerman |
Subject: |
Re: Delete file / undelete, problems |
Date: |
Wed, 14 Nov 2001 17:41:01 -0500 |
User-agent: |
Mutt/1.2.5i |
On Wed, Nov 14, 2001 at 02:12:49PM -0500, Ship, Howard wrote:
> It was deleted in 1.10, and back in 1.11.
>
> It was a while back, don't know if I did it "correctly".
Looks as though you did, judging by this log excerpt:
> revision 1.13
> date: 2001/11/10 21:42:19; author: hship; state: Exp; lines: +58 -60
^^^^^^^^^^^
> A summary of
> how to do it correctly would be useful. I believe I did
> cvs co -r1.9 ...
Probably something like:
cvs update -p -r1.9 ILifecycle.java >ILifecycle.java
> cvs add ...
> cvs commit
I believe you can also do something like:
cvs update -j1.10 -j1.9 ILifecycle.java
cvs commit
i.e. the first -j names the dead revision; the second names its
*predecessor*.
> Looks like the current releases are "Exp". So, you thik I should ask
> SourceForge to move it out of the attic?
Yup. Or here's a kludgy way do it yourself, without repo access:
#
# Delete the file again; this will fix up the inconsistency
# in the repo
#
cvs update ILifecycle.java # Force it back into the sandbox
cvs rm -f ILifecycle.java
cvs commit # Should work, even though the ,v
# file isn't where it it's
# supposed to be.
#
# At this point, the ,v file is still in the Attic, but with a
# "dead" revision. Thus the following will work.
#
# Try again to resurrect the file; this should do what the
# previous attempt didn't: move the ,v file out of the Attic.
#
cvs update -j1.15 -j1.14 ILifecycle.java # See below
cvs commit
For the second update, the -j values should be the "dead" revision you
just created and its *predecessor*, respectively.
Good luck.
--
| | /\
|-_|/ > Eric Siegerman, Toronto, Ont. address@hidden
| | /
The world has been attacked. The world must respond ... [but] we must
be guided by a commitment to do what works in the long run, not by what
makes us feel better in the short run.
- Jean Chrétien, Prime Minister of Canada