Rev 2779: Missed bundles in the return value conversion of vf.add_lines. in http://people.ubuntu.com/~robertc/baz2.0/commit

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/commit

------------------------------------------------------------
revno: 2779
revision-id: robertc at robertcollins.net-20070903202305-yj4obhvvw3j7t4jc
parent: robertc at robertcollins.net-20070903030326-xam93hxlthc6l37w
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Tue 2007-09-04 06:23:05 +1000
message:
  Missed bundles in the return value conversion of vf.add_lines.
modified:
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
=== modified file 'bzrlib/versionedfile.py'
--- a/bzrlib/versionedfile.py	2007-09-03 02:58:58 +0000
+++ b/bzrlib/versionedfile.py	2007-09-03 20:23:05 +0000
@@ -318,7 +318,7 @@
                     mpvf.get_diff(parent_ids[0]).num_lines()))
             else:
                 left_matching_blocks = None
-            version_text = self.add_lines(version, parent_ids, lines,
+            _, _, version_text = self.add_lines(version, parent_ids, lines,
                 vf_parents, left_matching_blocks=left_matching_blocks)
             vf_parents[version] = version_text
         for (version, parent_ids, expected_sha1, mpdiff), sha1 in\
@@ -687,7 +687,7 @@
             # deltas = self.source.get_deltas(order)
             for index, version in enumerate(order):
                 pb.update('Converting versioned data', index, len(order))
-                parent_text = target.add_lines(version,
+                _, _, parent_text = target.add_lines(version,
                                                self.source.get_parents(version),
                                                self.source.get_lines(version),
                                                parent_texts=parent_texts)