[MERGE] Joining of annotated and plain knits

[Ian Clatworthy]

Thanks to Robert for his response to my RFC last night on this code.
This version includes the changes suggested and passes all tests now.

We may wish to further improve the performance of this down the track
for the plain to annotated case. As Robert hinted in his email though,
step 1 is getting it working reliably (which I hope this patch does).

Ian C.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: knit-anno-plain-join-2.patch
Type: text/x-patch
Size: 16325 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070925/d949494f/attachment.bin