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

conflict: strange conflict marking

From: Jan Hendrik <jan.hendrik_at_bigfoot.com>
Date: 2004-04-07 13:35:06 CEST

Hi all out there!

Yesterday I was presented with a conflict during update here in the
office that looked very strange:

<p>Fürstenberg, Brief (11.6.1673)</p>
<p>Fürstenberg, Letter (6-11-1673)</p>
<<<<<<< .mine
<p>Koch - Kinsky, Katalog der Musikautogra-phen-Samlung >Louis Koch</p>
>>>>>>> .r340
<p>Certificate of Heirship</p>
<p>Koch - Kinsky, Katalog der Musikautogra-phen-Samlung Louis Koch</p>
<p>Koch - Kinsky, Catalogue of the Musical Autograph Collection Louis Koch</p>
<p>Kürschnermeister Carl Siegmund Brix' Hauserwerb zu Lüchow</p>

Note that between <<<<.mine and ===== there is no entry.
Unfortunately I missed to save the relevant parts in .mine and .r340
and .base, too. Generally the lines should have looked like this:

<p>Fürstenberg, Brief (11.6.1673)</p>
<p>Fürstenberg, Letter (6-11-1673)</p>
<p>Koch - Kinsky, Katalog der Musikautographen-Samlung >Louis Koch</p>
<p>Certificate of Heirship</p>
<p>Kürschnermeister Carl Siegmund Brix' Hauserwerb zu Lüchow</p>

According to log files and other research there should have been no
conflict at all as no one else here had to edit anything in this part of
the file since days. Updates on the machine generating the conflict
were done frequently.

That machine runs SVN 1.0.1-2, TSVN 1.0.2, W2K SP2.

Of course it was not difficult to get things straight, but I wonder how
the conflict could happen at all.

Jan Hendrik

Freedom quote:

     The right to be let alone is indeed the beginning of all freedom.
                -- Supreme Court Justice William O. Douglas

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Apr 7 13:34:38 2004

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.