Stefan Sperling:

> > I found a way to speed it up a bit further.
> 
> Here is an updated version of this patch.
> The previous version had a bug where I reversed the mixed-revision check.
> I am now including a new test case in the patch which checks for this issue.

All I can say is that it is significantly faster and approaches the
tree -R limit.  (5 merges, so 5 * the time of tree -R.)

    0m28.18s real     0m23.18s user     0m04.91s system

> Also, we can check the base commit ID on every file in the work tree.
> This is cheap since we are loading the entire file index anyway and it
> doesn't require any stat calls.

Ack.

-- 
Christian "naddy" Weisgerber                          naddy@mips.inka.de