Text archives Help

---

This is indicative of a conflict merge upon update. A fresh tree works just fine:

http://dashboards.sci.utah.edu:8081/Manta/Dashboard/

Sometimes svn can't determine how to merge an update with local modifications. It places <<<<<<, ========, and >>>>>>> to indicate which portions of a file are your changes, and which are part of the repository. It's up to you to do a manual merge. Once you do this, you have to remove the conflict status on the file.

svn resolved CMakeLists.txt

Alternatively if you didn't mean to make local modifications, you can simply revert the file.

James

On Jan 29, 2008, at 6:26 AM, harsha sri-narayana wrote:

ccmake from a clean build directory:

CMake Error: Error in cmake code at
/home/harsha/Manta/scenes/CMakeLists.txt:134:
Parse error.  Expected a command name, got unquoted argument with text
"<<<<<<<".

The end of a CMakeLists file was reached with an IF statement that was not
closed properly.
Within the directory: /home/harsha/Manta/scenes
The arguments are: SCENE_MACBETH


-Harsha

---

• [Manta] r2016 - trunk/Engine/Renderers, roni, 01/29/2008
  • [Manta] r2016 error, harsha sri-narayana, 01/29/2008
    • Re: [Manta] r2016 error, James Bigler, 01/29/2008
  • Message not available
    • Re: [Manta] r2016 error, Abe Stephens, 01/29/2008

---

Archive powered by MHonArc 2.6.16.