[merge] Make merge internals private

[John Arbash Meinel]

Aaron Bentley wrote:
> John Arbash Meinel wrote:
> 
>>>Notice that it has the same parent twice.
> 
> 
> Yes, there are a few of these revisions.  Originally, there was a bug in
> the code that set/unset (I forget which) pending merges.
> 
> 
>>>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?
> 
> 
> Well, historically, we haven't treated these as malformed, and the
> consequences of doing so would be pretty bad.  I guess the question is,
> why is this a problem now, and is it likely to continue being one?  If
> so, we should put a conservative bugfix in.
> 
> Aaron

Just to clarify, I'm not saying that these are illegal. Just that when
added to the Weave, it will ignore the fact that a parent is presented
more than once.

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