Re: Removed file was modified by second party

[Greg A. Woods]

[ On Monday, July 30, 2001 at 09:03:47 (-0700), Dennis Jones wrote: ]
> Subject: Removed file was modified by second party
>
> I removed a file in my local sandbox which was modified by someone else (not
> knowing that the file was going to be removed) before I committed the
> remove.  Now I cannot clean up my sandbox without modifying the CVS\Entries
> file.

Sure you can!  Just "cvs add file" to resurrect it, and then "cvs rm -f
file" to remove it again, and finally (before someone modifies it
elsewhere again :-), "cvs commit file".

> If I put a copy of the file in my sandbox and try to re-add it
> (theoretically so I could get a successful update then remove the file
> again), I get the message, "file should be removed and is still there (or is
> back again)".
> 
> I couldn't update and I couldn't re-add the file, so I was basically stuck.

You don't want to put a copy in your working directory -- just "cvs add"
to resurrect it and bring it up-to-date.  CVS can't resurrect the file
if some new copy materializes out of nowhere (well, no where it know about).

-- 
                                                        Greg A. Woods

+1 416 218-0098      VE3TCP      <address@hidden>     <address@hidden>
Planix, Inc. <address@hidden>;   Secrets of the Weird <address@hidden>