aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii2015-06-27 14:27:23 +0300
committerEli Zaretskii2015-06-27 14:27:23 +0300
commit7baae811651d73b3e89c832a5c15ff5b40c82635 (patch)
tree7db7653a9e9f620792be265f998bb98b38f77289 /lisp
parent31807189b55d9519a46e4b35fadbe20218e4ebea (diff)
downloademacs-7baae811651d73b3e89c832a5c15ff5b40c82635.tar.gz
emacs-7baae811651d73b3e89c832a5c15ff5b40c82635.zip
Fix VC test suite on MS-Windows
* lisp/vc/vc-svn.el (vc-svn-create-repo): Make sure the file: URL always starts with 3 slashes after the colon. * test/automated/vc-tests.el (vc-test--create-repo-function): Use 'w32-application-type' to invoke CVS on MS-Windows with properly formatted CVSROOT directory name.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/vc/vc-svn.el10
1 files changed, 9 insertions, 1 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 5ce9afa02c6..f97e2ab17e9 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -279,7 +279,15 @@ RESULT is a list of conses (FILE . STATE) for directory DIR."
279 ;; Expand default-directory because svn gets confused by eg 279 ;; Expand default-directory because svn gets confused by eg
280 ;; file://~/path/to/file. (Bug#15446). 280 ;; file://~/path/to/file. (Bug#15446).
281 (vc-svn-command "*vc*" 0 "." "checkout" 281 (vc-svn-command "*vc*" 0 "." "checkout"
282 (concat "file://" (expand-file-name default-directory) "SVN"))) 282 (let ((defdir (expand-file-name default-directory)))
283 (concat (if (and (stringp defdir)
284 (eq (aref defdir 0) ?/))
285 "file://"
286 ;; MS-Windows files d:/foo/bar need to
287 ;; begin with 3 leading slashes.
288 "file:///")
289 defdir
290 "SVN"))))
283 291
284(autoload 'vc-switches "vc") 292(autoload 'vc-switches "vc")
285 293