[merge] Make merge internals private

[Aaron Bentley]

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

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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD1o1p0F+nu1YWqI0RAuuqAJ9xI5JAHAHxJfBy22lKMrZ+jbsdtgCeKL02
OUgInzkJUUCqKWRy5YXIzZ0=
=UE9o
-----END PGP SIGNATURE-----