On Sun, Mar 31, 2002 at 10:40:48AM -0700, Keith Wiley wrote: > So assume I started with no project directory and I did a cvs update, > which created the directory and checkout everything. That worked, I > successfully built. Then I did my own personal modification to > fg_init.cxx and worked on that for a while. Then I did a new cvs > update, in the hopes I would get all the files that don't match my > project. I was hoping it would overwrite my changed files so I could > diff them from my modifications and bring my file up to date, but > instead, cvs update didn't overwrite fg_init.cxx. I'm left with my > original version and I can't see the new version. > > Why on Earth would cvs do this?
If any files in the archive have changed since your last update, cvs will attempt to merge the changes into your local tree. It will attempt to do this even if you've made local mods. If it can't merge the changes, it will mark the offending section of each file accordingly and then you'll need to edit them by hand to resolve the conflicts. > > ________________________________________________________________________ > Keith Wiley [EMAIL PROTECTED] > http://www.unm.edu/~keithw http://www.mp3.com/KeithWiley > > "Yet mark his perfect self-contentment, and hence learn his lesson, > that to be self-contented is to be vile and ignorant, and that to > aspire is better than to be blindly and impotently happy." > -- Edwin A. Abbott, Flatland > ________________________________________________________________________ > > _______________________________________________ > Flightgear-devel mailing list > [EMAIL PROTECTED] > http://mail.flightgear.org/mailman/listinfo/flightgear-devel -- Tony Peden [EMAIL PROTECTED] We all know Linux is great ... it does infinite loops in 5 seconds. -- attributed to Linus Torvalds _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
