/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: John Arbash Meinel
  • Date: 2007-02-13 20:33:57 UTC
  • mfrom: (2283 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2294.
  • Revision ID: john@arbash-meinel.com-20070213203357-b7yg41mi9sk6cqd0
[merge] bzr.dev 2283
resolve conflicts in moved repository formats
small issue with osutils.contains_whitespace()

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
384
384
            return 'added'
385
385
        elif new_entry is None:
386
386
            return 'removed'
 
387
        if old_entry.kind != new_entry.kind:
 
388
            return 'modified'
387
389
        text_modified, meta_modified = new_entry.detect_changes(old_entry)
388
390
        if text_modified or meta_modified:
389
391
            modified = True