[MERGE] be stricter in knit record serialisation, and bundle-generation-cornercase

[John Arbash Meinel]

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

Robert Collins wrote:
| On Fri, 2008-05-30 at 12:25 +1000, Robert Collins wrote:
|
|
|> I was going to say that we can't fix the bundle generation because there
|> are bzr's out there that will handle the tighter mpdiffs badly; but that
|> was before it turned out to be a much more general and common issue - I
|> now believe it is possible/likely to cause this just by editing and
|> committing files as normal, and thus we won't significantly reduce the
|> likelyhood of triggering it by not allowing bundles with the same
|> changes.
|
| Garh. I failed to properly isolate my tests as I evolved the test. You
| cannot actually trigger the bug without passing in
| 'left_matching_blocks' to add_lines. The only client I am aware of that
| does this is the bundle functionality - so it is indeed the case that
| fixing some bundle generation will break clients that would not
| otherwise break.
|
| Also, as my patch is not testing the right thing, I'm about to update it
| with one that directly passes in left_matching_blocks.
|
| BB:reject
|
| -Rob
|

By the way, annotate also makes use of left-matching-blocks.

John
=:->

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

iEYEARECAAYFAkg/8dEACgkQJdeBCYSNAANi0QCfW2x/Z06ShP4j25Flv9DmL/pr
WL4AoMSKi8aD7vRGI44HuZVatw7Q4Hnk
=DqZ5
-----END PGP SIGNATURE-----