[merge] Make merge internals private

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
> 
>>>For some reason, merging your branch takes *way* too long. On my fast
>>>machine it takes 10 minutes to do the merge. On my older machine, I
>>>killed it after about 15 minutes, but I'll run again to see how long it
>>>takes. (It seems to spend its time in Weave._extract() considering what
>>>happened when I canceled it)
> 
> 
> I've done quite a few uncommits in my time.  Perhaps that's the cause.
> 
> I've fixed the import problems I could see.  So feel free to integrate it.
> 
> Aaron

Well, 'clean-branch --dry-run --all' says that we have 10 unused
revisions, and 626 unused texts. Which is a bit, but not huge. Not
enough for me to see a 10 minute merge time.

I'm still waiting on the 'bzr pull' from your bzr.ab branch (it is still
on inventory merge), before I can pull it into jam-integration.

Something seems really wrong for it to be taking this long. But
whatever, when it finally comes in, I'll merge your changes. I might
even clean-branch and see what happens.

John
=:->
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 256 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060124/cc00d8ae/attachment.pgp