[MERGE] make knit joins reannotate-less

[Robert Collins]

On Thu, 2006-03-09 at 18:02 +0100, Johan Rydberg wrote:
> 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.

another good catch, thanks.

> > +    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.

The :foo: things drive a program called epydoc, which we decided to use
for autogenerated api documentation.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060310/787c4bae/attachment.pgp