← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Robert Collins
  • Date: 2005-08-23 06:52:09 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050823065209-81cd5962c401751b
move io redirection into each test case from the global runner

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
165
165
    def has_id(self, file_id):
166
166
        return self.tree.has_id(file_id)
167
167
 
168
 
    def has_or_had_id(self, file_id):
169
 
        if file_id == self.tree.inventory.root.file_id:
170
 
            return True
171
 
        return self.tree.inventory.has_id(file_id)
172
 
 
173
168
    def readonly_path(self, id):
174
169
        if id not in self.tree:
175
170
            return None