[MERGE][1.10][Bug #304841] Fixes for insert_record_stream() and stacked repos

[John Arbash Meinel]

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

I don't really feel like repeating everything again here. But the
justification for this patch can be found in the bug report:
https://bugs.edge.launchpad.net/bzr/+bug/304841

Basically, there is a fairly large collection of things that has to
happen to trigger this case. But in the end there was a merge revision
that was triggering the "expand to fulltext" fallback, but was doing so
before it had actually gotten enough of the delta chain to actually be
able to do so.

We triggered the fallback because the direct parent was present, just
not one of its ancestors, and the merge parent was present in the
fallback but not in the target.

The *easy* fix is to just sort topologically, because then you can't get
things out of order. I also went ahead and added that as a fix because
it seems the best way to avoid further bugs in 1.10-final. We can remove
it for bzr.dev if we want to keep pushing this code to be correct in any
other corner cases we get.

The *correct* fix was to change the code to only check if the
compression parent is not present. Also, there was a correctness issue
where we would go through the fulltext fallback even if we already had a
'knit-ft-gz', because we always checked the parents list, even if we
didn't have a delta.

If we want, we can merge the "correct" fix to bzr.dev for 1.11 and the
"easy" fix for 1.10. I don't really care, but we need to do something
for 1.10.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkk3CcwACgkQJdeBCYSNAAMRzwCgkhfWUdeJoEdK6fumOmSut9ye
Rd8An0deBOjIO8dzYF0Jy/6557J8p2pS
=fEyD
-----END PGP SIGNATURE-----
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: 304841-not-present-chain.patch
Url: https://lists.ubuntu.com/archives/bazaar/attachments/20081203/ffae224b/attachment-0001.diff