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

Re: Mismerge case

From: Greg Hudson <ghudson_at_MIT.EDU>
Date: 2005-08-11 01:01:20 CEST

On Wed, 2005-08-10 at 21:36 +0100, Philip Martin wrote:
> How many of those merge tools are built on top of GNU diff?

>From what I can tell:

  * diff3 is part of diff, so obviously generates a conflict.

  * CVS merging is built on top of gnu diff, so obviously generates a

  * "merge" is part of RCS, so might be independent from gnu dif, and
generates a conflict.

  * pcdv merge (Codeville's new merge algorithm) generates a conflict
because it requires one line of context.

  * darcs generates a correct merge (because it's lucky). This was a
bit of a surprise to zooko, who thought that darcs would generate a
conflict on parallel changes to adjacent lines.

  * Bitkeeper generates a correct merge (again, because it's lucky).

That's about 50/50 by straight numbers, but the first two are in much
greater use than the rest, and I'm not sure if darcs's behavior is 100%

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 11 01:02:37 2005

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

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