Rev 2378: Another workaround for trees that are already in the broken state. in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/commit_kind_change_90111

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/commit_kind_change_90111

------------------------------------------------------------
revno: 2378
revision-id: john at arbash-meinel.com-20070323202928-e39fjjn3u1ktj2t5
parent: john at arbash-meinel.com-20070323202323-u2rkmkkcily01t6o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: commit_kind_change_90111
timestamp: Fri 2007-03-23 15:29:28 -0500
message:
  Another workaround for trees that are already in the broken state.
  If the kind has changed from a parent, we know that this cannot be
  a copy of that parent.
modified:
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
-------------- next part --------------
=== modified file 'bzrlib/inventory.py'
--- a/bzrlib/inventory.py	2007-03-23 20:19:01 +0000
+++ b/bzrlib/inventory.py	2007-03-23 20:29:28 +0000
@@ -193,6 +193,9 @@
             if self.file_id in inv:
                 ie = inv[self.file_id]
                 assert ie.file_id == self.file_id
+                if ie.kind != self.kind:
+                    # Can't be a candidate if the kind has changed.
+                    continue
                 if ie.revision in candidates:
                     # same revision value in two different inventories:
                     # correct possible inconsistencies: