* Mike Rawlins -- Friday 17 February 2006 20:10: > cvs -d > :pserver:[EMAIL PROTECTED]:/var/cvs/FlightGear-0.9 > co data > > Was that a mistake?
No. You logged in once, and until you log out you can access the server. And you don't really need to log out. Most people don't (I claim). > Second, data/preferences.xml file > was corrupted with lines like > >>>>>>>>>>>>>>>>>>>>>>> > <<<<<<<<<<<<<<<<<<<<<< > > near the Nimitz scenario. So all in all it may have > been a poor fetch of the data, No. It's the cvs program that adds these lines (with exactly 7 <, >, or =). These are markers for lines where it found conflicts that it couldn't resolve. You probably made local modifications there, and it didn't know if it should let those, or fetch this part from the repository. You can either remove the lines between <<<<<<< and ======= (= your modifications), or the lines between ======= and >>>>>>> (the repository version). And, of course, you remove all markers. Or the radical solution: remove the file and "cvs up" again. m. ------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Do you grep through log files for problems? Stop! Download the new AJAX search engine that makes searching your log files as easy as surfing the web. DOWNLOAD SPLUNK! http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642 _______________________________________________ Flightgear-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/flightgear-users
