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

Re: conflict: strange conflict marking

From: Jan Hendrik <jan.hendrik_at_bigfoot.com>
Date: 2004-05-11 17:05:02 CEST

Concerning Re: conflict: strange conflict mark
kfogel@collab.net wrote on 10 May 2004, 13:35, at least in part:

> I think what's going on is that the principle of 'diff3' is to show a
> comparison between the two different final states, *not* between the
> two different changes. The other person changed two paragraphs, but
> the final state of their region still included that other paragraph
> that you deleted. Since that's what the file looked like for them at
> the time, that's what merge shows.

Not exactly, Karl. Say there are paragraphs 1-5. A deletes #2, B
modifies #4, the other paragraphs are not modified:

paragraph 1
paragraph 2 --> deleted by A
paragraph 3 --> not modified at all
paragraph 4 --> modified & committed by B
paragraph 5

Now that's what the merged file looked like after I updated:

paragraph 1
paragraph 2 (not modified by B, but deleted by A)
paragraph 3 (not modified at all)
paragraph 4 (modified by B)
paragraph 5

where I would have expected that SVN sees that one change is
before paragraph 3 (the deletion of #2), and the other change is
after paragraph 3 (the modification of #4), thus no conflict. As said
to Ben it is a pity I first did my work and resolved the conflict and
thought of posting only hours later ...

Jan Hendrik

Freedom quote:

     A lot of people out there pay good lip service
     to the idea of personal freedom ...
     right up to the point that someone tries to do something
     that they don't personally approve of.
                -- Neal Boortz

To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue May 11 17:02:51 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.