On Tue, Jul 12, 2005 at 11:12:14 -0700, Thomas Lord wrote: > I'm very skeptical of "the Codeville merge algorithm" for reasons > not terribly important here. Let's stipulate, for the sake > of conversation, that it's the greatest thing since toast and, > additionally, that it imposes a moral imperative on revctl developers > to optimize-for-annotate.
As far as I understand the Codeville merge algorithm, it is a line-wise
3-way merge. It reduces to 3-way merge when there is only one most
recent common ancestor to the two files. Thus the algorithm is actually
a bit better than pure 3-way merge.
On the other hand, it's better in the case when there is more than one
most recent common ancestor, which is very rare, so it's not really
a priority.
-------------------------------------------------------------------------------
Jan 'Bulb' Hudec <[EMAIL
PROTECTED]>
signature.asc
Description: Digital signature
_______________________________________________ Gnu-arch-users mailing list [email protected] http://lists.gnu.org/mailman/listinfo/gnu-arch-users GNU arch home page: http://savannah.gnu.org/projects/gnu-arch/
