← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Aaron Bentley
  • Date: 2006-08-26 20:33:16 UTC
  • mto: This revision was merged to the branch mainline in revision 2268.
  • Revision ID: aaron.bentley@utoronto.ca-20060826203316-d7112744d0ea94fc
Correctly handle all file kind changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
376
376
            return 'added'
377
377
        elif new_entry is None:
378
378
            return 'removed'
 
379
        if old_entry.kind != new_entry.kind:
 
380
            return 'modified'
379
381
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
380
382
        if text_modified or meta_modified:
381
383
            modified = True