On Thu, 8 Jan 2009, Geoff Air wrote: > Could someone with simgear CVS access please fix the coremag.cxx > file.Each time I checkout (or update) this file has this in its head :- > > <<<<<<< coremag.cxx// $Id: coremag.cxx,v 1.5 2006-10-28 22:12:48 curt Exp $=======// $Id: coremag.cxx,v 1.6 2008/07/25 18:35:42 ehofman Exp $>>>>>>> 1.6 > > I understand this is a known CVS problem where a checkin was not with > the same version as already in CVS ... it has been like this for months > - maybe since July 2008!
Hi, As far as I can see the file in CVS is ok. (Otherwise everybodys SimGear builds would fail :) The conflict is only in your local file - remove the file and run cvs up again. Cheers, Anders -- --------------------------------------------------------------------------- Anders Gidenstam WWW: http://www.gidenstam.org/FlightGear/ ------------------------------------------------------------------------------ Check out the new SourceForge.net Marketplace. It is the best place to buy or sell services for just about anything Open Source. http://p.sf.net/sfu/Xq1LFB _______________________________________________ Flightgear-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
