← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Robert Collins
  • Date: 2007-10-22 01:23:51 UTC
  • mfrom: (2921.3.1 graph)
  • mto: This revision was merged to the branch mainline in revision 2933.
  • Revision ID: robertc@robertcollins.net-20071022012351-16lm27an2lbzk038
Merge graph history-access bugfix.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
636
636
                label_pair = (to_label, from_label)
637
637
            else:
638
638
                label_pair = (from_label, to_label)
639
 
            print >> output_to, \
640
 
                  ("Binary files %s and %s differ" % label_pair).encode('utf8')
 
639
            output_to.write(
 
640
                  ("Binary files %s and %s differ\n" % label_pair).encode('utf8'))
641
641
 
642
642
    def has_text(self):
643
643
        """See InventoryEntry.has_text."""
742
742
                temp = from_text
743
743
                from_text = to_text
744
744
                to_text = temp
745
 
            print >>output_to, '=== target changed %r => %r' % (from_text, to_text)
 
745
            output_to.write('=== target changed %r => %r\n' % (from_text, to_text))
746
746
        else:
747
747
            if not reverse:
748
 
                print >>output_to, '=== target was %r' % self.symlink_target
 
748
                output_to.write('=== target was %r\n' % self.symlink_target)
749
749
            else:
750
 
                print >>output_to, '=== target is %r' % self.symlink_target
 
750
                output_to.write('=== target is %r\n' % self.symlink_target)
751
751
 
752
752
    def __init__(self, file_id, name, parent_id):
753
753
        super(InventoryLink, self).__init__(file_id, name, parent_id)