From 7fbb47976eca08ae8fee6ac1a64ad961ef25d9f4 Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 10 Apr 2008 07:32:25 +0000 Subject: * vc-hooks.el (vc-state): Add new state `conflict'. (vc-after-save): Use when not if. (vc-default-mode-line-string): Deal with the conflict state. (vc-prefix-map): (vc-menu-map): Bind vc-status instead of vc-directory. * vc.el (vc-editable-p): (vc-default-status-printer): (vc-next-action): Deal with the conflict state. (vc-mark-resolved): New function. (vc-status-mode): Fix mode name. (vc-default-comment-history): Use when not if. (Todo): Add new entries, remove old ones. * vc-cvs.el (vc-cvs-merge, vc-cvs-merge-news): Set conflict state. (vc-cvs-parse-status): (vc-cvs-after-dir-status): * vc-svn.el (vc-svn-after-dir-status, vc-svn-parse-status): Detect the conflict state. --- lisp/vc-svn.el | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'lisp/vc-svn.el') 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)) -- cgit v1.2.3