[MERGE] make knit joins reannotate-less

[Johan Rydberg]

Robert Collins <robertc at robertcollins.net> writes:

> @@ -483,7 +512,7 @@
>                  options.append('no-eol')
>                  lines[-1] = lines[-1] + '\n'
>  
> -        lines = self.factory.make(lines, len(self._index))
> +        lines = self.factory.make(lines, version_id) #len(self._index))

The comment should go.

> +    def _record_to_data(self, version_id, digest, lines):
> +        """Convert version_id, digest, lines into a raw data block.
> +        
> +        :return: (len, a StringIO instance with the raw data ready to read.)
> +        """

Either convert the whole file to using those phony :X: things, or
write it using English, which is better IMHO.

Otherwise, +1.

~j