[MERGE] stop checking content and revision uniqueness during knit insertions in commit

Ian Clatworthy ian.clatworthy at internode.on.net
Wed Sep 12 02:59:57 BST 2007

Robert Collins wrote:
> This is an updated patch as per Ian's feedback.


bb: tweak

You need to also add a check_contents parameter to _add_lines in
repofmt/knitrepo.py. This missing parameter is breaking the test suite

> === modified file 'bzrlib/reconcile.py'
>                  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)

You need an extra parameter on the end for check_content now as well.

> +            correctly is expensive and extermely unlikely to catch bugs so it

Spelling of extremely. :-)

> === modified file 'bzrlib/weave.py'
> @@ -870,11 +870,11 @@
>              self._save()
>      def _add_lines(self, version_id, parents, lines, parent_texts,
> -        left_matching_blocks, nostore_sha):
> +        left_matching_blocks, nostore_sha, random_id):
>          """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

check_contents parameter needed here in both declaration and super call.

Ian C.

More information about the bazaar mailing list