diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2008-04-10 07:32:25 +0000 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2008-04-10 07:32:25 +0000 |
| commit | 7fbb47976eca08ae8fee6ac1a64ad961ef25d9f4 (patch) | |
| tree | f2d15f2f9a6ef93d17652d22ae3aa07c307be9cb /lisp/vc-svn.el | |
| parent | 6e81a223a467cd1fcbd5ff88cab8c29766044bc1 (diff) | |
| download | emacs-7fbb47976eca08ae8fee6ac1a64ad961ef25d9f4.tar.gz | |
* 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.
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)) |