Jon S. Berndt wrote: > Forgive me. It was my mistake. Turns out that when I updated from > FlightGear CVS there was there was a conflict with > usr/Include/config.h.in and some spurious characters were inserted by > CVS detailing the conflicts. This is a warning, however, that others > of you may run into this problem, and to be aware of it. I haven't > seen this happen, before. Must have been some major changes to FGFS to > cause this to happen.
It doesn't take major changes, just multiple changes to the same line. CVS is line-based; if I have a file in the archive: line1 line2 line3 And you modify it: line1 line2-fix1 line3 And I check in a change: line1 line2-fix2 line3 When you do a cvs update, it doesn't know what to put in the second line, so you get something like: line1 <<<<<< [revision info for this version:] line2-fix1 >>>>>> [revision info for the other version:] line2-fix2 ------ line3 This is CVS's way of making sure you know about the problem. They carefully picked their line noise such that it fails to parse under every language known to man. :) This, by the way, is one of the reasons why checking in "derived" files, like "configure" or "config.h" is a bad idea. The compilation process makes silent changes to these files, which are a conflict waiting to happen if someone else checks an updated version into the archive. Andy -- Andrew J. Ross NextBus Information Systems Senior Software Engineer Emeryville, CA [EMAIL PROTECTED] http://www.nextbus.com "Men go crazy in conflagrations. They only get better one by one." - Sting (misquoted) _______________________________________________ Flightgear-devel mailing list [EMAIL PROTECTED] http://mail.flightgear.org/mailman/listinfo/flightgear-devel
