Rev 315: Handle children in replaced dirs more gracefully. in http://people.samba.org/bzr/jelmer/bzr-svn/bzr.dev

[Jelmer Vernooij]

------------------------------------------------------------
revno: 315
revision-id: jelmer at samba.org-20061227034807-w9dva17y9ao13c2z
parent: jelmer at samba.org-20061227030523-zbw1bndpbqprkd3e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: main
timestamp: Wed 2006-12-27 04:48:07 +0100
message:
  Handle children in replaced dirs more gracefully.
modified:
  fetch.py                       fetch.py-20060625004942-x2lfaib8ra707a8p-1
=== modified file 'fetch.py'
--- a/fetch.py	2006-12-27 03:05:23 +0000
+++ b/fetch.py	2006-12-27 03:48:07 +0000
@@ -128,9 +128,10 @@
             ie = self.inventory[base_file_id]
             for name in ie.children:
                 ie.children[name].parent_id = file_id
-            del self.inventory[base_file_id]
+            # FIXME: Don't touch inventory internals
+            del self.inventory._byid[base_file_id]
+            self.inventory._byid[file_id] = ie
             ie.file_id = file_id
-            self.inventory.add(ie)
             self.dir_baserev[file_id] = []
         ie.revision = revision_id
         return file_id