Rev 2810: Unbreak weaves. in http://people.ubuntu.com/~robertc/baz2.0/knits

[Robert Collins]

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

------------------------------------------------------------
revno: 2810
revision-id: robertc at robertcollins.net-20070911040511-g0wxzi6iyr3u379q
parent: robertc at robertcollins.net-20070910035304-iwf9nmqoxeshjaki
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knits
timestamp: Tue 2007-09-11 14:05:11 +1000
message:
  Unbreak weaves.
modified:
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
=== modified file 'bzrlib/reconcile.py'
--- a/bzrlib/reconcile.py	2007-09-05 03:51:59 +0000
+++ b/bzrlib/reconcile.py	2007-09-11 04:05:11 +0000
@@ -171,7 +171,7 @@
                 # reconcile.
                 new_inventory_vf._check_write_ok()
                 Weave._add_lines(new_inventory_vf, rev_id, parents,
-                    self.inventory.get_lines(rev_id), None, None, None)
+                    self.inventory.get_lines(rev_id), None, None, None, False)
             else:
                 new_inventory_vf.add_lines(rev_id, parents, self.inventory.get_lines(rev_id))
 

=== modified file 'bzrlib/weave.py'
--- a/bzrlib/weave.py	2007-09-10 03:53:04 +0000
+++ b/bzrlib/weave.py	2007-09-11 04:05:11 +0000
@@ -261,7 +261,7 @@
         return idx
 
     def _add_lines(self, version_id, parents, lines, parent_texts,
-       left_matching_blocks, nostore_sha):
+       left_matching_blocks, nostore_sha, random_id):
         """See VersionedFile.add_lines."""
         idx = self._add(version_id, lines, map(self._lookup, parents),
             nostore_sha=nostore_sha)
@@ -874,7 +874,7 @@
         """Add a version and save the weave."""
         self.check_not_reserved_id(version_id)
         result = super(WeaveFile, self)._add_lines(version_id, parents, lines,
-            parent_texts, left_matching_blocks, nostore_sha)
+            parent_texts, left_matching_blocks, nostore_sha, random_id)
         self._save()
         return result