/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: Aaron Bentley
  • Date: 2007-12-19 06:04:19 UTC
  • mfrom: (3127 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3128.
  • Revision ID: aaron.bentley@utoronto.ca-20071219060419-afwva4q14cjlzfta
Merge with bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
50
50
    BzrCheckError,
51
51
    BzrError,
52
52
    )
53
 
from bzrlib.symbol_versioning import deprecated_method, zero_ninetyone
 
53
from bzrlib.symbol_versioning import deprecated_method
54
54
from bzrlib.trace import mutter
55
55
 
56
56
 
142
142
        """
143
143
        return False, False
144
144
 
145
 
    @deprecated_method(symbol_versioning.zero_ninetythree)
 
145
    @deprecated_method(symbol_versioning.one_zero)
146
146
    def diff(self, text_diff, from_label, tree, to_label, to_entry, to_tree,
147
147
             output_to, reverse=False):
148
148
        """Perform a diff from this to to_entry.
198
198
                    candidates[ie.revision] = ie
199
199
        return candidates
200
200
 
201
 
    @deprecated_method(zero_ninetyone)
 
201
    @deprecated_method(symbol_versioning.zero_ninetyone)
202
202
    def find_previous_heads(self, previous_inventories,
203
203
                            versioned_file_store,
204
204
                            transaction,