[MERGE] new merge-type=lca

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Andrew Bennetts wrote:
>   * weave: too slow.  I gave up waiting after a couple of minutes of 100% CPU (I
>     presume the lack of annotation caches in my pack repository caused this).

Hmm, odd.  This operation should scale linearly with the number of
uncommon revisions.  Were there a lot, perhaps?

>   * lca: 1 conflict, took ~8.5s.
> 
> The conflicts were all pretty trivial anyway, but as a mere human it'd take more
> than 2.1s for me to resolve them, so I'm very happy with --merge-type=lca so
> far.  Good work!

Cool, thanks.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHewaL0F+nu1YWqI0RAs7mAJ9/1IqJIqz+NVna4pThPMQnU+db8gCfTDPh
1RsU2quCB6hAN+/6DNhiIic=
=9uXM
-----END PGP SIGNATURE-----