Mercurial > emacs
diff lisp/vc-bzr.el @ 108397:c5b62c5789d8
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Fri, 15 Jan 2010 14:21:59 +0000 |
parents | 328951014a28 |
children | 38312121c181 |
line wrap: on
line diff
--- a/lisp/vc-bzr.el Wed Jan 13 14:05:08 2010 +0000 +++ b/lisp/vc-bzr.el Fri Jan 15 14:21:59 2010 +0000 @@ -363,8 +363,9 @@ (let ((l-c-parent-dir (match-string 1))) (when (and (memq system-type '(ms-dos windows-nt)) (string-match-p "^/[[:alpha:]]:" l-c-parent-dir)) - ;;; On Windows, file:// URLs often have three slashes, - ;;; so we must remove the remaining one (bug#5345) + ;;; The non-Windows code takes a shortcut by using the host/path + ;;; separator slash as the start of the absolute path. That + ;;; does not work on Windows, so we must remove it (bug#5345) (setq l-c-parent-dir (substring l-c-parent-dir 1))) (setq branch-format-file (expand-file-name vc-bzr-admin-branch-format-file