* Melchior FRANZ -- Tuesday 21 February 2006 11:11: > It wasn't a script. It was all hand-made and verified multiple > times. The patch was correct. Only: it had no context lines (my > fault), and Erik installed it over files with uncommitted changes, > and committed it in one go.
But, no. This doesn't explain it. The context lines are only there to allow cvs to resolve minor conflicts *automatically*. But there should still conflicts have been reported while committing. After all, the '-' line has to match at exactly the right line number, to be replaced by the '+' line. So I change my mind: it can't have been my fault. Hmmm ... 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-devel mailing list Flightgear-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/flightgear-devel
