Both ClearCase and Perforce are known for their excellent merge
capabilities and I believe neither are based upon diff or gnu diff. I
wonder how these two tools would handle this situation?
On 8/10/05, Greg Hudson <ghudson@mit.edu> wrote:
> 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
> conflict.
>
> * "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%
> intended.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
>
>
--
--
David Weintraub
qazwart@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Aug 11 15:37:38 2005