← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Martin Pool
  • Date: 2009-03-12 05:44:43 UTC
  • mfrom: (4124 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4144.
  • Revision ID: mbp@sourcefrog.net-20090312054443-rz5kodxh1cjjx2id
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree.py
729
729
                kind = 'tree-reference'
730
730
            return kind, None, None, None
731
731
        elif kind == 'symlink':
732
 
            return ('symlink', None, None, os.readlink(abspath.encode(osutils._fs_enc)))
 
732
            return ('symlink', None, None,
 
733
                    os.readlink(abspath.encode(osutils._fs_enc)
 
734
                                ).decode(osutils._fs_enc))
733
735
        else:
734
736
            return (kind, None, None, None)
735
737