/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Martin von Gagern
  • Date: 2010-05-28 14:15:28 UTC
  • mto: This revision was merged to the branch mainline in revision 5284.
  • Revision ID: martin.vgagern@gmx.net-20100528141528-px8k6i9pqdyob91l
Add --directory option to 7 more commands.

This batch adds a --directory option to the following commands:
conflicts, merge-directive, missing, resolve, shelve, switch, unshelve

Blackbox tests for all of these are included.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1455
1455
    def get_lines(self, tree, file_id):
1456
1456
        """Return the lines in a file, or an empty list."""
1457
1457
        if tree.has_id(file_id):
1458
 
            return tree.get_file(file_id).readlines()
 
1458
            return tree.get_file_lines(file_id)
1459
1459
        else:
1460
1460
            return []
1461
1461