← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Martin Pool
  • Date: 2007-04-01 06:19:16 UTC
  • mfrom: (2323.5.20 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
193
193
            if self.file_id in inv:
194
194
                ie = inv[self.file_id]
195
195
                assert ie.file_id == self.file_id
 
196
                if ie.kind != self.kind:
 
197
                    # Can't be a candidate if the kind has changed.
 
198
                    continue
196
199
                if ie.revision in candidates:
197
200
                    # same revision value in two different inventories:
198
201
                    # correct possible inconsistencies:
491
494
        # renamed
492
495
        elif previous_ie.name != self.name:
493
496
            compatible = False
 
497
        elif previous_ie.kind != self.kind:
 
498
            compatible = False
494
499
        return compatible
495
500
 
496
501
    def _read_tree_state(self, path, work_tree):