[MERGE][1.0] New annotate merge that performs well on packs

Aaron Bentley aaron.bentley at utoronto.ca
Sun Dec 2 18:42:32 GMT 2007


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

Hi all,

Annotate merge (--merge-type=weave) is our best solution for handling
criss-cross merges.  But the current implementation performs horribly on
packs.  Fortunately, we don't actually need all the information used by
the current implementation.  This new implementation uses only the
precise information we need, so it performs far, far better.

With knits, it is slightly slower.

Old implementation (best of 3):
real    0m1.877s
user    0m1.688s
sys     0m0.164s

New implementation (best of 3):
real    0m2.029s
user    0m1.856s
sys     0m0.136s

So that's 1.10x as slow.

But on packs:
Old implementation (best of 3):
real    0m19.531s
user    0m18.609s
sys     0m0.468s


New implementation (best of 3):
real    0m3.441s
user    0m3.228s
sys     0m0.144s

That's 5x as fast!

I think that if new users encounter the need to use annotate merge, the
current implementation will give us a black eye in the area we don't
want any: performance.

So I think that if possible, we should get this into 1.0.

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

iD8DBQFHUvyX0F+nu1YWqI0RAjQAAJ0RMryaCwDhw2QJ4+QNedju5BpweQCfRrig
OV/28TKD+Piy3NbJNzfZNww=
=hOTd
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-0367ka.patch
Type: text/x-diff
Size: 30435 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071202/9d2b3e5b/attachment-0001.bin 


More information about the bazaar mailing list