diff options
Diffstat (limited to 'lisp/vc-svn.el')
| -rw-r--r-- | lisp/vc-svn.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el index c2c665cb275..1328765a8fe 100644 --- a/lisp/vc-svn.el +++ b/lisp/vc-svn.el @@ -160,7 +160,7 @@ If you want to force an empty list of arguments, use t." (defun vc-svn-after-dir-status (callback buffer) (let ((state-map '((?A . added) - (?C . edited) + (?C . conflict) (?D . removed) (?I . ignored) (?M . edited) @@ -636,7 +636,9 @@ information about FILENAME and return its status." (vc-file-setprop file 'vc-working-revision "0") (vc-file-setprop file 'vc-checkout-time 0) 'added) - ((memq status '(?M ?C)) + ((eq status ?C) + (vc-file-setprop file 'vc-state 'conflict)) + ((eq status '?M) (if (eq (char-after (match-beginning 1)) ?*) 'needs-merge 'edited)) |