← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/transport/local.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-06 08:09:14 UTC
  • mfrom: (6191.1.1 trunk)
  • Revision ID: pqm@pqm.ubuntu.com-20111006080914-364iz1580zxvpxtm
(vila) Merge 2.4 into trunk resolving conflicts (Vincent Ladeuil)

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