← 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 at utoronto
  • Date: 2005-08-09 02:29:48 UTC
  • mto: (1092.1.41) (1185.3.4) (974.1.47)
  • mto: This revision was merged to the branch mainline in revision 1110.
  • Revision ID: aaron.bentley@utoronto.ca-20050809022948-8033a55a5b25c705
Fixed bugs in merge optimization

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
146
146
        self.cached = {}
147
147
 
148
148
    def __contains__(self, file_id):
149
 
        return id in self.tree
 
149
        return file_id in self.tree
150
150
 
151
151
    def get_file_sha1(self, id):
152
152
        return self.tree.get_file_sha1(id)