← 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-04-19 02:16:05 UTC
  • mto: This revision was merged to the branch mainline in revision 1673.
  • Revision ID: aaron.bentley@utoronto.ca-20060419021605-7f28e84382ceef4d
Apply merge review suggestions

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
585
585
                text_diff(to_label, to_text,
586
586
                          from_label, from_text, output_to)
587
587
        except BinaryFile:
588
 
            print >> output_to, "Binary files differ"
 
588
            if reverse:
 
589
                label_pair = (to_label, from_label)
 
590
            else:
 
591
                label_pair = (from_label, to_label)
 
592
            print >> output_to, "Binary files %s and %s differ" % label_pair
589
593
 
590
594
    def has_text(self):
591
595
        """See InventoryEntry.has_text."""