Rev 4356: Stop checking for duplicate names in inventories at the object layer: live objects guard against this anyway. in http://people.ubuntu.com/~robertc/baz2.0/check

Robert Collins robertc at robertcollins.net
Mon Jun 1 02:53:42 BST 2009


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

------------------------------------------------------------
revno: 4356
revision-id: robertc at robertcollins.net-20090601015336-yjjkkneufeteugxk
parent: robertc at robertcollins.net-20090512080451-f6egga3vbw0zzs3u
committer: Robert Collins <robertc at robertcollins.net>
branch nick: check
timestamp: Mon 2009-06-01 11:53:36 +1000
message:
  Stop checking for duplicate names in inventories at the object layer: live objects guard against this anyway.
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py	2009-05-12 08:04:51 +0000
+++ b/bzrlib/check.py	2009-06-01 01:53:36 +0000
@@ -341,16 +341,10 @@
             self._report_items.append(
                 "Missing inventory for revision {%s}" % rev_id)
         inv = tree.inventory
-        seen_names = set()
         for path, ie in inv.iter_entries():
             self._add_entry_to_text_key_references(inv, ie)
             file_id = ie.file_id
             ie.check(self, rev_id, inv, tree)
-            if path in seen_names:
-                raise BzrCheckError('duplicated path %s '
-                                    'in inventory for revision {%s}'
-                                    % (path, rev_id))
-            seen_names.add(path)
 
     def _add_entry_to_text_key_references(self, inv, entry):
         if not self.rich_roots and entry == inv.root:




More information about the bazaar-commits mailing list