Rev 5948: Can't just delete trans_id in new_paths because some don't come from limbo. in http://bazaar.launchpad.net/~jameinel/bzr/integration

[John Arbash Meinel]

At http://bazaar.launchpad.net/~jameinel/bzr/integration

------------------------------------------------------------
revno: 5948
revision-id: john at arbash-meinel.com-20110601085917-fgsyq3nnut6navd4
parent: john at arbash-meinel.com-20110601084437-hdeywp2wkyyh1ig7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: integration
timestamp: Wed 2011-06-01 10:59:17 +0200
message:
  Can't just delete trans_id in new_paths because some don't come from limbo.
-------------- next part --------------
=== modified file 'bzrlib/transform.py'
--- a/bzrlib/transform.py	2011-06-01 08:44:37 +0000
+++ b/bzrlib/transform.py	2011-06-01 08:59:17 +0000
@@ -1849,8 +1849,11 @@
                     self._observed_sha1s[trans_id] = (o_sha1, st)
         finally:
             child_pb.finished()
-        for trans_id in self._new_contents:
-            del self._limbo_files[trans_id]
+        for path, trans_id in new_paths:
+            # new_paths includes stuff like workingtree conflicts. Only the
+            # stuff in new_contents actually comes from limbo.
+            if trans_id in self._limbo_files:
+                del self._limbo_files[trans_id]
         self._new_contents.clear()
         return modified_paths