← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin
  • Date: 2009-09-20 22:12:36 UTC
  • mto: This revision was merged to the branch mainline in revision 5257.
  • Revision ID: gzlist@googlemail.com-20090920221236-84nyjpop0ttgfwzj
Ensure all files opened by bazaar proper are explicitly closed

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1196
1196
    def get_lines(self, tree, file_id):
1197
1197
        """Return the lines in a file, or an empty list."""
1198
1198
        if file_id in tree:
1199
 
            return tree.get_file(file_id).readlines()
 
1199
            return tree.get_file_lines(file_id)
1200
1200
        else:
1201
1201
            return []
1202
1202