Michael Barton wrote: > I just updated develbranch_6 svn and compiled. > v.surf.bspline will no longer compile. Lots of errors (or > the same error many times. .... > main.c: In function ‘main’: > main.c:358: error: syntax error before ‘<<’ token > main.c: At top level: > main.c:370: error: syntax error before ‘==’ token > main.c:373: error: initializer element is not constant > main.c:373: warning: data definition has no type or storage class ....
it seems svn update had a conflict during the merge. in those cases the files have the old/new bits which could not be merged like: <<<<<<<<<<<<< .... ============= .... >>>>>>>>>>>>> which the C compiler tries to interpret as code, and it fails. Markus: > Delete file + svn up should solve it. Michael: > That fixed it. Thanks. and keep an eye out for any "C" conflict status files when doing svn up. edit/fix and do "svn resolved filename.ext" (or rm file & svn update if you don't mind abandoning local changes) Hamish _______________________________________________ grass-dev mailing list [email protected] http://lists.osgeo.org/mailman/listinfo/grass-dev
