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

Re: Bug in merge (repro included)

From: Philip Martin <philip_at_codematters.co.uk>
Date: 2005-02-03 18:04:52 CET

Ben Collins-Sussman <sussman@collab.net> writes:

> Sander Striker: what do you think? Is this a bug in our diff3
> algorithm?
>
> Thomas says that GNU diff3 produces a conflict with these files also.

Subversion doesn't use the exact same algorithm as GNU diff3. There
are cases where one generates a conflict and the other does not,
here's an example that is similar to Thomas'

$ cat foo-b1
a
b
c
d
e
$ cat foo-b2
a
b
B
c
e
$ diff -u foo-b1 foo-b2
--- foo-b1 Thu Feb 3 16:56:02 2005
+++ foo-b2 Thu Feb 3 16:56:29 2005
@@ -1,5 +1,5 @@
 a
 b
+B
 c
-d
 e
$ cat foo-t
a
b
c
e
$ diff3 -m foo-t foo-b1 foo-b2
b
B
c
<<<<<<< foo-b1
d
=======
>>>>>>> foo-b2
e
$ subversion/tests/libsvn_diff/diff3-test foo-t foo-b1 foo-b2
a
b
B
c
e

Different results, but it's not clear that GNU is right and Subversion
is wrong.

-- 
Philip Martin
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Feb 3 18:06:24 2005

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