Dan Stromberg wrote: > On Sat, 08 Jan 2005 13:15:56 -0500, Larry Jones wrote: > > cvs up -r1.7 -p myfile >myfile > > cvs add myfile > > > > or with a merge: > > > > cvs up -j1.8 -j1.7 myfile > 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
There appears to be a local copy of the file. Delete that copy, then try the command again and it should work fine. Actually, you might want to start with a fresh checkout - that way, any left over cruft from previous attempts to ressurect the file won't confuse the issue. -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. ( http://www.leitch.com ) Columnist, C/C++ Users Journal ( http://www.cuj.com/experts ) _______________________________________________ Info-cvs mailing list [email protected] http://lists.gnu.org/mailman/listinfo/info-cvs
