[PATCH] Living up to Zooko -- "historic" annotate/merge [repost]

[Csaba Henk]

On 2006-01-07, Bryan O'Sullivan <bos at serpentine.com> wrote:
> On Fri, 2006-01-06 at 11:25 -0800, Bryan O'Sullivan wrote:
>
>> Interesting patch in general.
>
> One more comment: the annotation code looks like it's likely to be slow.

Premature optimization is the root of whatever...

It seems that my changes won't get included until we'll have a bdiff based
3-merge... In that case, I hope it won't be singificantly slower than
the current algorithm. Let's get there first. 

> Please try some sample merges on a Linux kernel repository.  Some files
> are touched very frequently; hence, this has a better chance of flushing
> out performance problems than a "hello world" repo.

Good idea, I'll play a bit with that in due time.

Regards,
Csaba