Bug in reweave

[Aaron Bentley]

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

For those reading this, this bug cannot affect new, natively-created bzr
branches.  It's strictly related to upgrades and conversions from other
formats, with ghosts present.

John A Meinel wrote:
| Attached is a diff of the specific content which disagrees. (it is in
| the inventory)

Thanks for your quick work on this, John.  I was afraid something like
this could happen, but I was worried about baz2bzr imports disagreeing.
~ Same case though--ghosts.
| <message>- merge in separately-developed weave code</message>

Oh, the irony!

| I think what happened is that in the upgrade code, in one branch it
| actually had the revision, and could attribute the text to the correct
| revision, in the other branch, it had to guess, so it guessed *this*
| revision. Now they disagree, so now they can't be merged.

Well, I don't have any brilliant ideas.  I am rather surprised that the
parent revisions are incorrectly noted in the revision, though.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFD2aZd0F+nu1YWqI0RAk4kAJ0WFhs28U3Mu5Tutt6J/CuIjrCBvgCcC2JJ
HB+Z0LAwuo/pafVBXonUw68=
=kIsQ
-----END PGP SIGNATURE-----