Seamus Thomas Carroll wrote: > Hi, > > 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 > M fg_init.cxx > M fg_props.cxx > M fg_props.hxx > M globals.cxx > M globals.hxx > M main.cxx > M main.hxx > M options.cxx > > An "ls -al" does not contain any hidden files but when I run "cvs diff" > many differences are reported that do not occur in my version of the code. > What is the proper method for merging the main branch with my changes? > > At one point I deleted some hidden files of the form ".#*" which must be the > root of my problem. Is there any way to fix the mess i have created > without getting a new cvs copy and manually adding all of my code back in?
Don't worry about that. These files are not modified every day, and not necessarily at the same lines where you made your own mods. If you don't have sticky tags ( check with "cvs status fg_commands.cxx" for instance ), all is fine. A conflict only occurs when the same area of the same file was modified by someone else when you do "cvs up". If you want the original file, say fg_init.cxx : mv fg_init.cxx fg_init.cxx.mod cvs up fg_init.cxx of course, your mods are in fg_init.cxx.mod and will not be compiled. -Fred _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
