← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin Pool
  • Date: 2005-08-23 00:27:12 UTC
  • Revision ID: mbp@sourcefrog.net-20050823002712-2b0f5e12243a6116
- merge aaron's merge improvements 999..1008

abentley@panoramicfeedback.com-20050822154931-a0da28d30681e2c6

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
 
168
173
    def readonly_path(self, id):
169
174
        if id not in self.tree:
170
175
            return None