Re: Restoring Dead Files

[Todd Denniston]

Res Pons wrote, On 07/09/2008 04:06 PM:
> Hi
>  
> A file having its extension in capital letters, image_cust1.JPG, 
> was accidentally deleted by a user, instead of, 
> being renamed to image_cust1.cap. 

Let us be clear with one another...
A) The user issued one of `delete image_cust1.JPG` or `remove image_cust1.JPG`
[removed it from the sandbox]
OR
B) The user issued the equivalent of `cvs remove -f image_cust1.JPG`
[removed it from the sandbox and told CVS to remove it from the repository on 
the next commit]
OR
C) The user issued the equivalent of
`cvs remove -f image_cust1.JPG` and `cvs commit`
[removed it from the sandbox and the repository]

A) can be recovered from by doing a `cvs update` in the directory.
B) should be able to be recovered from using `cvs update -C` I think.
B) _could_ be recovered from by _carefully_ hand editing the CVS/Entries file. 
{I recommend waiting a bit to see if anyone else responds before using this 
option, i.e., to a newbie 'here be dragons'.}
B & C) should be able to recover from using the method you have used below. 
(but I think from the errors you got, that A was what was used...i.e. they 
only did an OS remove not a cvs remove.)

BTW I am not sure of what to make of your last output... it should not be 
giving that if the user had not at least gone to the (B) method above {I 
think} and I would not expect the server output the add command received if 
(B) had been done. {I'm confused}

Hope this helps.


>  
> I am the CVS Admin and have direct ssh access to the linux Repository server and our users including myself, use WinCVS and Windows commandline to access CVS.
>  
> I CD'd to the subfolder where the file was deleted and ran the following commands from a DOS prompt
> (in the first command, should the file before (greaterThanSign) > be 
> image_cust1.JPG or .jpg or does it matter?)
> C:\MyCVS\images>cvs -Q update -p -r 1.1 image_cust1.JPG > image_cust1.jpg
>  
> C:\MyCVS\images>cvs add -kb image_cust1.jpgcvs server: image_cust1.jpg has already been entered
>  
> C:\MyCVS\images>cvs ci -m "revived jpg image" image_cust1.jpgcvs server: cannot add file `image_cust1.jpg' when RCS file `/repo/images/image_cust1.jpg,v' already existscvs [server aborted]: correct above errors first!
>  
> C:\MyCVS\images>cvs updatecvs server: Updating .A image_cust1.jpg
>  
> C:\MyCVS\images>
>  
>  
> As you can see, when I do an update, I see the file pending with an ADD status but committing it will cause an error.  Any ideas or help please.


--
Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane)
Harnessing the Power of Technology for the Warfighter