[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

Actually, I've found the problem. We have a parent mismatch. It seems we
might have come across a ghost.
Weave Parent Mismatch: Parents are mismatched for version
	{abentley at panoramicfeedback.com-20050825131025-2aa94bcbbd646a00}

['aaron.bentley at utoronto.ca-20050825023004-581548615ae1066d']

['aaron.bentley at utoronto.ca-20050825023004-581548615ae1066d',
'aaron.bentley at utoronto.ca-20050825023004-581548615ae1066d']

I think we have a bogus revision. Specifically if I look at this
revision I get
<revision committer="Aaron Bentley &lt;abentley at panoramicfeedback.com&gt;"
  format="5" inventory_sha1="a98af1c09195853aaed76045ac11c9b4ce1d8744"

revision_id="abentley at panoramicfeedback.com-20050825131025-2aa94bcbbd646a00"

  timestamp="1124975425.473726034" timezone="-14400">
<message>Fixed return value when not an ImmutableStore</message>
<parents>
<revision_ref
revision_id="aaron.bentley at utoronto.ca-20050825023004-581548615ae1066d" />
<revision_ref
revision_id="aaron.bentley at utoronto.ca-20050825023004-581548615ae1066d" />
</parents>
</revision>

Notice that it has the same parent twice.
I have no idea what is going on here, but it is causing me all sorts of
trouble when merging against a tree with this entry. Because it forces a
'reweave' of the inventory.weave.

I'm thinking about fixing up the Weave code, so that it ignores
duplicated parents. What do you think?

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/a6c11976/attachment.pgp