Possible bug in subversion -

Hello,

I've noticed a strange problem when checking out from subversion - I'm
not sure if its a bug or not.

Yesterday I checked out code from svn://svn.berlios.de/mapnik/trunk
using svn, version 1.3.1 from the Ubuntu repository. One of the files
contained characters like:

<<<<<<<<<<

in it. When the program failed to compile, I removed the oddness from
the files and compiled. Then I was about to commit what I thought
were bug fixed to the code, but before doing so, I updated from the
same repository on another box - this time the same revision did not
have these characters.

This morning I have checked out code from:

http://svn.openstreetmap.org/java

using Subclipse 1.0.4 running on a MacBook. Again, there are
characters that should not be there like:

<<<<<<< .mine
                size(WINDOW_WIDTH, WINDOW_HEIGHT);
                smooth();

                // this font should have all special characters - open
                // to suggestions for changes though
                font = loadFont("/data/LucidaSansUnicode-11.vlw");

                // initialise node manager and add buttons in desired order
                modeManager = new ModeManager(this);
                modeManager.addMode(moveMode);
                modeManager.addMode(nodeMode);
                modeManager.addMode(lineMode);
                modeManager.addMode(wayMode);
                modeManager.addMode(nameMode);
                modeManager.addMode(nodeMoveMode);
                modeManager.addMode(deleteMode);
                modeManager.addMode(zoominMode);
                modeManager.addMode(zoomoutMode);
        modeManager.addMode(addnodetosegMode);

                modeManager.draw(); // make modeManager set up things
=======
>>>>>>> .r1940

Comparing this to the code in Trac for the same project, the
characters are not supposed to be there. Both of the checkouts were
carried out from the same LAN - if this could be the problem?

Anyway, I'd be interested to know what has cuased this,

-- 
Nick Black
--------------------------------
http://www.blacksworld.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org