emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] /srv/bzr/emacs/trunk r103492: vc-svn fix for bug#7663 on M


From: Glenn Morris
Subject: [Emacs-diffs] /srv/bzr/emacs/trunk r103492: vc-svn fix for bug#7663 on MS Windows. (tiny change)
Date: Wed, 02 Mar 2011 23:27:52 -0800
User-agent: Bazaar (2.0.3)

------------------------------------------------------------
revno: 103492
author: Vagn Johansen <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-03-02 23:27:52 -0800
message:
  vc-svn fix for bug#7663 on MS Windows.  (tiny change)
  
  * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
  programs output backslashes.
modified:
  lisp/ChangeLog
  lisp/vc/vc-svn.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-03-03 07:08:22 +0000
+++ b/lisp/ChangeLog    2011-03-03 07:27:52 +0000
@@ -1,3 +1,8 @@
+2011-03-03  Vagn Johansen  <address@hidden>  (tiny change)
+
+       * vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
+       programs output backslashes.  (Bug#7663)
+
 2011-03-03  Glenn Morris  <address@hidden>
 
        * mail/sendmail.el (mail-mode-map): Remove mail-sent-via.

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2011-02-12 01:12:53 +0000
+++ b/lisp/vc/vc-svn.el 2011-03-03 07:27:52 +0000
@@ -174,7 +174,9 @@
     (while (re-search-forward re nil t)
       (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
             (propstat (cdr (assq (aref (match-string 2) 0) state-map)))
-           (filename (match-string 4)))
+            (filename (if (memq system-type '(windows-nt ms-dos))
+                          (replace-regexp-in-string "\\\\" "/" (match-string 
4))
+                        (match-string 4))))
         (and (memq propstat '(conflict edited))
              (not (eq state 'conflict)) ; conflict always wins
              (setq state propstat))


reply via email to

[Prev in Thread] Current Thread [Next in Thread]