[MERGE] faster and smaller reconcile

Robert Collins robertc at robertcollins.net
Fri Nov 16 07:35:52 GMT 2007


On Thu, 2007-11-15 at 21:57 -0600, John Arbash Meinel wrote:
> 
> Nice fix. But what about the memory consumption?

About 90M was it's peak for bzr.dev. bzr.dev's reconcile was 300ish.

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

Yes, theres a couple of extra components, and I have the pb tweak to the
generate-text-index patch. I'll send in patches for these shortly.

-Rob
-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- 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/5e3a49bd/attachment.pgp 


More information about the bazaar mailing list