bzr too slow

[Aaron Bentley]

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

John Arbash Meinel wrote:
>>Another thing that take a little too long is merges.
>>
>>[ardome at ardweb3 ardome]$ time bzr merge
>>All changes applied successfully.
>>
>>real    2m33.340s
>>user    2m25.480s
>>sys     0m2.240s
>>
> 
> 
> I'm guessing switching to knits will help the merge time. Part of the
> problem is merging two weaves into eachother, which is a little
> expensive. (It extracts all of the full texts, and then re-adds them to
> the weave).

Another thing is that with long branches, picking the common base can
take a while.

In my tests, quite some time ago now, "merge --force" on a clean tree
with base set to 01 and no changes took < 10s on a kernel tree.  So
anything additional would be the per-file or per-revision merge cost.

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

iD8DBQFDxQ+A0F+nu1YWqI0RAtm6AJ4hSTwo9QiGW9Fhhc8sdYWI5AwlmwCdHYcV
7jBlgUzULVNu5wkeFlWYTi4=
=IFB6
-----END PGP SIGNATURE-----