From: Hans-Bernhard B. <br...@ph...> - 2004-05-04 10:54:40
|
On Mon, 3 May 2004, James R. Van Zandt wrote: > BTW when I do "cvs update" I get several complaints like this: > > cvs update: conflict: tutorial/Makefile.in is modified but no longer > in the repository Then you must have neglected to update in ages. tutorial/Makefile.in has been removed from the repository since January 2003. > What's the best way of getting rid of them? Delete all files you get this complaint about, then run cvs update ./prepare > I.e. how to I accept the > deletion of a file from the repository? Should I just delete the line > in tutorial/CVS/Entries that starts out with "/Makefile.in" ? No. Never muck with CVS' private files unless you absolutely have to. -- Hans-Bernhard Broeker (br...@ph...) Even if all the snow were burnt, ashes would remain. |