← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-03-12 05:21:02 UTC
  • mfrom: (4108.1.3 jamesw-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20090312052102-ksjfiyd5ctzibuo1
Merge 1.13 back to trunk,
        and move new things in bzr.dev to top of NEWS.

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