diff options
Diffstat (limited to 'lisp/vc')
| -rw-r--r-- | lisp/vc/vc-svn.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index 20c7689f401..7362258a42d 100644 --- a/lisp/vc/vc-svn.el +++ b/lisp/vc/vc-svn.el | |||
| @@ -174,7 +174,9 @@ If you want to force an empty list of arguments, use t." | |||
| 174 | (while (re-search-forward re nil t) | 174 | (while (re-search-forward re nil t) |
| 175 | (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) | 175 | (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) |
| 176 | (propstat (cdr (assq (aref (match-string 2) 0) state-map))) | 176 | (propstat (cdr (assq (aref (match-string 2) 0) state-map))) |
| 177 | (filename (match-string 4))) | 177 | (filename (if (memq system-type '(windows-nt ms-dos)) |
| 178 | (replace-regexp-in-string "\\\\" "/" (match-string 4)) | ||
| 179 | (match-string 4)))) | ||
| 178 | (and (memq propstat '(conflict edited)) | 180 | (and (memq propstat '(conflict edited)) |
| 179 | (not (eq state 'conflict)) ; conflict always wins | 181 | (not (eq state 'conflict)) ; conflict always wins |
| 180 | (setq state propstat)) | 182 | (setq state propstat)) |