[MERGE] faster and smaller reconcile

John Arbash Meinel john at arbash-meinel.com
Fri Nov 16 03:57:44 GMT 2007


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

Robert Collins wrote:
> 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).

Nice fix. But what about the memory consumption?

> 
> 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
> 

I've reviewed and mostly approved your 2 earlier patches. Is it possible to get
those updated and merged so that I don't have to review them again? Or maybe
just generate the diff without that for me?

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHPRU4JdeBCYSNAAMRArpPAKDMY7EcLzYWpc359vSB1axTPbT7/wCg2ZQw
thRniHU61m7y0HVIg28VKpQ=
=3w60
-----END PGP SIGNATURE-----



More information about the bazaar mailing list