Re: How do you get back a file after it has been "cvs remove"'d?

[Dan Stromberg]

On Sat, 08 Jan 2005 13:15:56 -0500, Larry Jones wrote:

> Stephen Carville writes:
>> 
>> This is probably not the best way to do it, but when I had to recover some 
>> files that were 'inadvertenely deleted, I logged onto the server, located 
>> the 
>> files in the "Attic", copied them to their regular directory, and then 
>> changed
>>  
>> "state dead;" to "state Exp;"
> 
> No, that's not the best way to do it.  In fact, it's probably the worst
> way possible.  It's akin to cutting a hole through the side of your
> house to get in rather than using the door.  You undo a removal the same
> way you undo any other change -- either brute force:
> 
>       cvs up -r1.7 -p myfile >myfile
>       cvs add myfile
> 
> or with a merge:
> 
>       cvs up -j1.8 -j1.7 myfile
> 
> (Assuming that the current dead revision is 1.8 and thus the revision
> you want to resurrect is 1.7.)
> 
> -Larry Jones
> 
> No one can prove I did that!! -- Calvin

Neither of these appear to be working for me:

autoinst-root> cvs log 600-etc-procmailrc |less -sc

autoinst-root> cvs up -j1.5 -j1.4 600-etc-procmailrc
cvs update: conflict: 600-etc-procmailrc is modified but no longer in the 
repository
C 600-etc-procmailrc

#cai does a syntax check, and attempts to do a checkin

autoinst-root> cai 600-etc-procmailrc
syntax check ok
cvs commit: Up-to-date check failed for `600-etc-procmailrc'
cvs [commit aborted]: correct above errors first!
cvs update: Updating .
? inetd-ent.t
? x86info
cvs update: Updating .
M 010-is-NIS-server
M 555-dynamic-dcslib
M 606-tcp-wrappers-common
M 928-sendmail
cvs update: Updating .

autoinst-root> cvs update
cvs update: Updating .
C 410-sun-patches
C 540-support-accounts
cvs update: conflict: 600-etc-procmailrc is modified but no longer in the 
repository
C 600-etc-procmailrc
M 600-pc_clname
? 540-support-accounts.new
? 600-postfix

autoinst-root> cai 600-etc-procmailrc
syntax check ok
cvs commit: Up-to-date check failed for `600-etc-procmailrc'
cvs [commit aborted]: correct above errors first!
cvs update: Updating .
? inetd-ent.t
? x86info
cvs update: Updating .
M 010-is-NIS-server
M 555-dynamic-dcslib
M 606-tcp-wrappers-common
M 928-sendmail
cvs update: Updating .

autoinst-root>

autoinst-root> cvs add 600-etc-procmailrc
cvs add: 600-etc-procmailrc already exists, with version number 1.4

autoinst-root> cvs add 600-etc-procmailrc

autoinst-root> cvs up -j1.5 -j1.4 600-etc-procmailrc

autoinst-root> cvs up -r1.7 -p  600-etc-procmailrc >  600-etc-procmailrc
cvs update: conflict: 600-etc-procmailrc is modified but no longer in the 
repository

autoinst-root> cvs up -r1.7 -p  600-etc-procmailrc >  600-etc-procmailrc

autoinst-root>


Am I doing something silly?

Thanks!