[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Possible bug in subversion -

From: Ulrich Eckhardt <eckhardt_at_satorlaser.com>
Date: 2007-01-19 10:22:20 CET

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

It's not a bug but a feature.


           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
Received on Fri Jan 19 10:22:56 2007

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.