Rev 4542: Fix parent_id_basename map update in CHKInventory more. in http://bazaar.launchpad.net/~lifeless/bzr/apply-inventory-delta

[Robert Collins]

At http://bazaar.launchpad.net/~lifeless/bzr/apply-inventory-delta

------------------------------------------------------------
revno: 4542
revision-id: robertc at robertcollins.net-20090717020426-xz7uaj0uzgykemu4
parent: robertc at robertcollins.net-20090717020331-qfx5ut7465gu1vj9
committer: Robert Collins <robertc at robertcollins.net>
branch nick: apply-inventory-delta
timestamp: Fri 2009-07-17 12:04:26 +1000
message:
  Fix parent_id_basename map update in CHKInventory more.
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2009-07-17 00:46:37 +0000
+++ b/bzrlib/inventory.py	2009-07-17 02:04:26 +0000
@@ -1733,7 +1733,10 @@
             # to spend less time calculating the delta.
             delta_list = []
             for key, (old_key, value) in parent_id_basename_delta.iteritems():
-                delta_list.append((old_key, key, value))
+                if value:
+                    delta_list.append((old_key, key, value))
+                else:
+                    delta_list.append((old_key, None, None))
             result.parent_id_basename_to_file_id.apply_delta(delta_list)
         parents.discard(('', None))
         for parent_path, parent in parents: