Seamus Thomas Carroll said: > 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? >
Have you set any sticky tags? That's the only thing I can think of. Take a look at your CVS/Entries file in that folder. I think the tag would be the last field. For example... /main.cxx/1.145/Mon Feb 2 01:17:22 2004// That's what the main.cxx row looks like in my file. And the file has a "D" by itself on the last row. All the rows have a double slash // at the end and nothing after, indicating the last field is empty. You could try editing the file and removing anything that looks like a tag (i.e. anything other than /filename/version/timestamp//. Of course you could also use the cvs commands to clean it up. That is probably the right thing to do, but I'm one of those people that always drives 10-15 over on the highway and buys eyeglasses at the dime store when the doctor says I "need" a $250 perscription pair :-) (I do backup files though ;-)) Best, Jim _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
