Mattia Barbiero wrote:
> Hi,
> I have do "svn up" to get last source code but when I have do "make" I
> have got this error message:
>
> CMake Error: Error in cmake code at
> /home/mattia/k3d-svn/k3d/modules/CMakeLists.txt:11:
> Parse error. Expected a command name, got unquoted argument with text
> "<<<<<<<".
If you do "svn update", you will see a list of files with a "C" next to
them (you probably overlooked this when you did the update). That means
that there was a merge conflict - the "<<<<<<<" is a conflict marker. A
merge conflict happens when someone made changes to a file where you've
also made your own local changes - in this case, you have to manually
sort-things out. You might want to look through the subversion book online:
http://svnbook.red-bean.com/en/1.4/svn.tour.cycle.html#svn.tour.cycle.resolveCheers,
Tim
-------------------------------------------------------------------------
This SF.net email is sponsored by the 2008 JavaOne(SM) Conference
Don't miss this year's exciting event. There's still time to save $100.
Use priority code J8TL2D2.
http://ad.doubleclick.net/clk;198757673;13503038;p?http://java.sun.com/javaone_______________________________________________
K3d-development mailing list
K3d-development@...
https://lists.sourceforge.net/lists/listinfo/k3d-development
