[MERGE] Don't join the lines of the index twice.

[James Westby]

Hi,

I think this is correct. Here's the diff with extra
context to make it clearer.

=== modified file 'bzrlib/index.py'
--- bzrlib/index.py	2008-04-24 07:22:53 +0000
+++ bzrlib/index.py	2008-06-17 09:31:14 +0000
@@ -217,11 +217,11 @@
         result = StringIO(''.join(lines))
         if expected_bytes and len(result.getvalue()) != expected_bytes:
             raise errors.BzrError('Failed index creation. Internal
error:'
                 ' mismatched output length and expected length: %d %d'
%
                 (len(result.getvalue()), expected_bytes))
-        return StringIO(''.join(lines))
+        return result
 
 
 class GraphIndex(object):
     """An index for data with embedded graphs.
  
The idea came from TimeHorse in bug 230472. Someone may
want to look at the full patch there in more detail, I
didn't feel qualified to judge it.

Thanks,

James

-------------- next part --------------
A non-text attachment was scrubbed...
Name: bzr-dev-3499.patch
Type: text/x-patch
Size: 2107 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080617/12c6951f/attachment.bin