procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Stefan Monnier 2009-05-05 04:17:27 +00:00
parent 97355c3832
commit e6c01f094d
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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).

4
lisp/vc-svn.el
View file

@ -157,9 +157,9 @@ want to force an empty list of arguments, use t."
(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 @@ information about FILENAME and return its status."
'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))))