[merge][1.6][#234748] fix KnitCorrupt error in check on bzr.dev

[John Arbash Meinel]

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

Martin Pool wrote:
| Here's an updated version with review feedback from Robert and
| including his related changes to Knit.add_lines with matching blocks
| specified.
|
| Robert suggests that John might want to scrutinize this for knit
| extraction performance.  I am sure we are doing more copying of data
| in here than the minimum necessary, but not because of this change.
|
|

I don't see any places where we are copying the list of lines that we *weren't*
copying it before. So I don't expect any regressions there.

BB:approve

(though I'm trusting that the tests you added actually trigger the bugs you've
encountered)

John
=:->

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

iEYEARECAAYFAkhGncsACgkQJdeBCYSNAAMnqQCcCJQYHsTYyZeNnBV+it6w+MA1
j10AnRsjmVVyzbMJ3Z9TiYo9N1VmDIgg
=BXAt
-----END PGP SIGNATURE-----