Mercurial > emacs

changeset 103154:276b0724ed86

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-svn-parse-status): Accept ?D for removed files (bug#3213).
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 05 May 2009 04:17:27 +0000
parents ce30850e6e3f
children 5f8f851b71b9
files lisp/ChangeLog lisp/vc-svn.el
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Tue May 05 04:02:45 2009 +0000
+++ b/lisp/ChangeLog	Tue May 05 04:17:27 2009 +0000
@@ -1,3 +1,7 @@
+2009-05-05  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>  (tiny change)
+
+	* vc-svn.el (vc-svn-parse-status): ?D is for removed files (bug#3213).
+
 2009-05-05  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* vc.el (vc-delete-file): Add autoload cookie (bug#3209).
--- a/lisp/vc-svn.el	Tue May 05 04:02:45 2009 +0000
+++ b/lisp/vc-svn.el	Tue May 05 04:17:27 2009 +0000
@@ -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))))