[MERGE REVIEW] plan-merge for knits

[Aaron Bentley]

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

Martin Pool wrote:
| I'd write
|
|   [t for (a, t) in annotated_a]
|
| just to make the precedence obvious.

Okay.

|    # process mismatched sections before this block

Actually, it turns out all mismatches sections are processed here,
because the last 'block' produced by get_blocks is a dummy.  I've
removed the section we thought was handling final mismatches.

|    # and now the matched section

| This looks good, very clear and concise.

Thanks.

| Is this really needed at all?  From the way it's used above it might be
| simpler and perhaps faster to simply put the annotated lines into lists
| and then slice the lists.

I've done this, and removed xenumerate.  It's even shorter now, even
with comments.

And it's off to PQM...

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

iD8DBQFERahk0F+nu1YWqI0RAmZfAJ0a9s3i9DSviem707lfrjyakeU4ZACfW/6E
fb9Y4RDf+W9IMybl7xBX6Bk=
=SCih
-----END PGP SIGNATURE-----