* Seamus Thomas Carroll -- Saturday 21 February 2004 00:58: > Every once and a while I update my cvs checkout. I have begun to notice > that a "cvs update -d -P" does not merge my modified file with the checked > out file. A conflict is not reported because the cvs update only presents > an M. ie: > cvs update: Updating . > M fg_commands.cxx
try $ cvs status fg_commands.cxx and if it doesn't return "(none)" for each 'Sticky' entry, then make $ cvs up -A > At one point I deleted some hidden files of the form ".#*" which must be the > root of my problem. No. These are created if something *is* merged in. m. _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
