[MERGE] faster and smaller reconcile

Robert Collins robertc at robertcollins.net
Fri Nov 16 03:05:37 GMT 2007


This patch contains all the little ones I've been assembling, and
replaces the core of reconcile and check.

Its faster:
bzr.dev:
real    42m12.059s
user    40m22.679s
sys     1m31.770s
this:
real    36m27.321s
user    34m43.838s
sys     1m28.786s
(on bzr.dev).

It generates ever so slightly different output, but AFAICT that's due to
a bug in the old code. (See the check_reconcile scenarios - one asked
for a fulltext on rev4, but rev4 had a parent rev2 which was being
preserved, so there was no need for a fulltext coercion.).

I'm going to cross-check the check output of bzr.dev against a
reconciled-via-this shortly, but I think its all fine.

The UI is slightly borked - multiple 0-1 progress bars, I'd like to
polish that in a separate patch if thats ok.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-mail-hxHxiR.patch
Type: text/x-patch
Size: 72194 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071116/bc084140/attachment-0001.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20071116/bc084140/attachment-0001.pgp 


More information about the bazaar mailing list