You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Nick Black <ni...@gmail.com> on 2007/01/19 08:54:23 UTC
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
Re: Possible bug in subversion -
Posted by Greg Thomas <th...@omc.bt.co.uk>.
On Fri, 19 Jan 2007 09:10:14 +0000 (UTC), Duncan Booth
<du...@suttoncourtenay.org.uk> wrote:
>Read the manual: the file in the working copy had been edited, and a
>revision in the repository had an edit in the same part of the file. In
>that situation subversion cannot automatically merge in the changes so it
>marks them and lets you do it. Use 'svn status' to find which files are
>conflicted and either 'svn resolved' or 'svn revert' as appropriate.
Wasn't there a pre-commit hook hanging around somewhere to stop this
sort of thing being committed to the repository?
Greg
--
This post represents the views of the author and does
not necessarily accurately represent the views of BT.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Possible bug in subversion -
Posted by Duncan Booth <du...@suttoncourtenay.org.uk>.
"Nick Black" <ni...@gmail.com> wrote:
> 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,
Read the manual: the file in the working copy had been edited, and a
revision in the repository had an edit in the same part of the file. In
that situation subversion cannot automatically merge in the changes so it
marks them and lets you do it. Use 'svn status' to find which files are
conflicted and either 'svn resolved' or 'svn revert' as appropriate.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Possible bug in subversion -
Posted by Ulrich Eckhardt <ec...@satorlaser.com>.
On Friday 19 January 2007 09:54, Nick Black wrote:
> 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.
Those are markers that signal a conflict in a merge operation. So, either you
didn't read Subversion's output telling you there is a conflict with you
local changes or somebody else ignored that information and even checked in
the faulty merge including the conflict markers.
> 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.
I don't believe that the same revision suddenly changed. If these markers were
present in the revision, they will still be there. If they were generated
locally in order to notify you of conflicting changes that's a different
issue.
It's not a bug but a feature.
Uli
**************************************************************************************
Visit our website at <http://www.satorlaser.de/>
**************************************************************************************
Diese E-Mail einschließlich sämtlicher Anhänge ist nur für den Adressaten bestimmt und kann vertrauliche Informationen enthalten. Bitte benachrichtigen Sie den Absender umgehend, falls Sie nicht der beabsichtigte Empfänger sein sollten. Die E-Mail ist in diesem Fall zu löschen und darf weder gelesen, weitergeleitet, veröffentlicht oder anderweitig benutzt werden.
E-Mails können durch Dritte gelesen werden und Viren sowie nichtautorisierte Änderungen enthalten. Sator Laser GmbH ist für diese Folgen nicht verantwortlich.
**************************************************************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org