← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

  • Committer: Andrew Bennetts
  • Date: 2007-11-30 05:42:00 UTC
  • mfrom: (3052 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3057.
  • Revision ID: andrew.bennetts@canonical.com-20071130054200-tp1k3vfbczd78cjo
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
142
142
        """
143
143
        return False, False
144
144
 
 
145
    @deprecated_method(symbol_versioning.zero_ninetythree)
145
146
    def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
146
147
             output_to, reverse=False):
147
148
        """Perform a diff from this to to_entry.