← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: abentley
  • Date: 2005-10-14 02:38:46 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1460.
  • Revision ID: abentley@lappy-20051014023846-276686141002cfa1
remove method definition

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
273
273
            return True
274
274
        return self.tree.inventory.has_id(file_id)
275
275
 
276
 
    def has_or_had_id(self, file_id):
277
 
        if file_id == self.tree.inventory.root.file_id:
278
 
            return True
279
 
        return self.tree.inventory.has_id(file_id)
280
 
 
281
276
    def kind(self, file_id):
282
277
        return self.tree.kind(file_id)
283
278