This happened because somebody checked in a version of SConstruct that was updated with conflicts by CVS. The programmer is supposed to search for <<<< and >>>> which mark the conflicting lines and resolve the conflict, then commit the file.

In other words, CVS normally automatically merges changes during an update operation, replacing older lines with newer lines. If it can't do an automatic merge, it puts in these markers along with both sets of lines.

Regards,
Mike

-----Original Message-----
From: Dave Phillips 
Sent: May 23, 2005 8:22 AM
To: csound-devel@lists.sourceforge.net
Subject: [Cs-dev] minor SConstruct errors

Greetings:

  A couple of errors showed up in this morning's CVS SConstruct file. 
GCC 3.2.2 doesn't like C++ style commenting, so lines with either <<<< 
or >>>> stop the show. Ditto for lines that look like =====. Commenting 
out that stuff in the usual fashion fixed it, compile proceeded normally 
with no errors (default scons values).

Best,

dp




-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/csound-devel





-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net

Michael Gogins wrote:

> This happened because somebody checked in a version of SConstruct
 > that was updated with conflicts by CVS.

I did not notice that anything like that happened.


-------------------------------------------------------
This SF.Net email is sponsored by Oracle Space Sweepstakes
Want to be the first software developer in space?
Enter now for the Oracle Space Sweepstakes!
http://ads.osdn.com/?ad_id=7412&alloc_id=16344&op=click
_______________________________________________
Csound-devel mailing list
Csound-devel@lists.sourceforge.net