Monday 21 July 2003 2:58:27 am

Selmah,

I would not recommend using the svn version of eZ publish if you're not doing development which needs it. We are constantly doing changes and break things daily and fix it.

When you use the svn version of eZ publish things will not always work as expected, because we are working on it.

--bård

Documentation: http://ez.no/doc

Monday 21 July 2003 4:18:34 am

The reason for the error is that there has been a conflict when you updated, notice the <<<<<<< .mine =======
If you do a
svn st
you'll probably see a
C kernel/classes/datatypes/ezxmltext/handlers/input/ezsimplifiedxmlinput.php

The reason for the conflict is that you have been modifying the same lines as the person who comitted last time. I recommend reading the svn documentation on subversion.tigris.org to learn about conflicts and conflict handling.

--
Amos

Documentation: http://ez.no/ez_publish/documentation
FAQ: http://ez.no/ez_publish/documentation/faq