[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-05-10 19:10:51 CEST

Well, I had this strange conflict markers today again:

Had deleted a paragraph in my working copy. Someone else did a
change two paragraphs further and committed. On update I got the
conflict with the <<<<.mine/==== being empty, and the
====/>>>>.rxxx part containing three paragraphs: the one I had
deleted, the next unchanged paragraph, and finally the third
changed on the repository.

Should think that SVN is intelligent enough to understand that one
change happened *before* a given paragraph and the other *after*.
Also note that in the original case posted there was no delete nor
any other modification. So there should not have been any conflict
at all. Any clue?

Jan Hendrik
Freedom quote:

     Let us build cathedrals of peace,
     where the people are free.
                -- Ronald Reagan

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon May 10 19:09:02 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.