← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2011-05-14 21:16:04 UTC
  • mfrom: (5861 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5863.
  • Revision ID: jelmer@samba.org-20110514211604-cxcvynog8js68qlx
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
1889
1889
                                       identifier))
1890
1890
        return self._repository.iter_files_bytes(repo_desired_files)
1891
1891
 
1892
 
    def get_symlink_target(self, file_id):
 
1892
    def get_symlink_target(self, file_id, path=None):
1893
1893
        entry = self._get_entry(file_id=file_id)
1894
1894
        parent_index = self._get_parent_index()
1895
1895
        if entry[1][parent_index][0] != 'l':