← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-06 07:43:13 UTC
  • mfrom: (6015.33.8 2.4)
  • mto: This revision was merged to the branch mainline in revision 6192.
  • Revision ID: v.ladeuil+lp@free.fr-20111006074313-w3f2t8lgzy04pjjb
Merge 2.4 into trunk resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/transport/local.py
567
567
        self._local_base = urlutils._win32_local_path_from_url(base)
568
568
 
569
569
    def abspath(self, relpath):
570
 
        path = osutils.normpath(osutils.pathjoin(
 
570
        path = osutils._win32_normpath(osutils.pathjoin(
571
571
                    self._local_base, urlutils.unescape(relpath)))
572
572
        return urlutils._win32_local_path_to_url(path)
573
573