[Emacs-diffs] emacs/lisp ChangeLog vc-svn.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/05/05 04:17:30

Modified files:
        lisp           : ChangeLog vc-svn.el 

Log message:
        (vc-svn-parse-status): Accept ?D for removed files (bug#3213).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15629&r2=1.15630
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/vc-svn.el?cvsroot=emacs&r1=1.113&r2=1.114

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15629
retrieving revision 1.15630
diff -u -b -r1.15629 -r1.15630
--- ChangeLog   5 May 2009 04:02:45 -0000       1.15629
+++ ChangeLog   5 May 2009 04:17:27 -0000       1.15630
@@ -1,3 +1,7 @@
+2009-05-05  Bob Rogers  <address@hidden>  (tiny change)
+
+       * vc-svn.el (vc-svn-parse-status): ?D is for removed files (bug#3213).
+
 2009-05-05  Stefan Monnier  <address@hidden>
 
        * vc.el (vc-delete-file): Add autoload cookie (bug#3209).

Index: vc-svn.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/vc-svn.el,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- vc-svn.el   15 Apr 2009 00:32:51 -0000      1.113
+++ vc-svn.el   5 May 2009 04:17:29 -0000       1.114
@@ -157,9 +157,9 @@
 (defun vc-svn-after-dir-status (callback &optional remote)
   (let ((state-map '((?A . added)
                      (?C . conflict)
-                     (?D . removed)
                      (?I . ignored)
                      (?M . edited)
+                     (?D . removed)
                      (?R . removed)
                      (?? . unregistered)
                      ;; This is what vc-svn-parse-status does.
@@ -662,7 +662,7 @@
             'edited))
          ((eq status ?I)
           (vc-file-setprop file 'vc-state 'ignored))
-         ((eq status ?R)
+         ((memq status '(?D ?R))
           (vc-file-setprop file 'vc-state 'removed))
          (t 'edited)))))
     (when filename (vc-file-getprop filename 'vc-state))))