[GRASS-user] latest i.pca does not compile?

[Hamish]

Nikos wrote:
> nik at vertical:/geo/osgeo/src/grass6_devel/imagery/i.pca$
> make
> gcc
> -I/geo/osgeo/src/grass6_devel/dist.x86_64-unknown-linux-gnu/include
> -g -Wall   
>    -DPACKAGE=\""grassmods"\"
> -I/geo/osgeo/src/grass6_devel/dist.x86_64-unknown-linux-gnu/include
> -o
> OBJ.x86_64-unknown-linux-gnu/support.o -c support.c
> support.c: In function ‘write_history’:
> support.c:62: error: expected expression before
> ‘<<’ token
> support.c:65: error: expected expression before ‘==’
> token
> support.c:68: error: expected expression before
> ‘>>’ token
> support.c:71: warning: format not a string literal and no
> format
> arguments
> make: *** [OBJ.x86_64-unknown-linux-gnu/support.o] Error 1


that is most likely a result of a svn merge conflict.
(look for lines starting with "C" during svn up)

if you look in the code you'll see like:

<<<<<<<<<< .mine
abc
===========
abd
>>>>>>>>>>> .r12345

fix those in the code then do "svn resolved filename.c"


Hamish