← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Aaron Bentley
  • Date: 2005-08-26 14:39:43 UTC
  • mfrom: (974.2.7) (974.2.6)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: abentley@panoramicfeedback.com-20050826143943-c677569cfb887d35
Merged changes from the merge4 branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
178
178
    def has_id(self, file_id):
179
179
        return self.tree.has_id(file_id)
180
180
 
 
181
    def has_or_had_id(self, file_id):
 
182
        if file_id == self.tree.inventory.root.file_id:
 
183
            return True
 
184
        return self.tree.inventory.has_id(file_id)
 
185
 
181
186
    def readonly_path(self, id):
182
187
        if id not in self.tree:
183
188
            return None