[Emacs-diffs] Changes to emacs/lisp/vc-cvs.el,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/04/10 07:32:27

Index: vc-cvs.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/vc-cvs.el,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -b -r1.116 -r1.117
--- vc-cvs.el   9 Apr 2008 20:42:38 -0000       1.116
+++ vc-cvs.el   10 Apr 2008 07:32:25 -0000      1.117
@@ -436,8 +436,13 @@
   (with-current-buffer (get-buffer "*vc*")
     (goto-char (point-min))
     (if (re-search-forward "conflicts during merge" nil t)
-        1                              ; signal error
-      0)))                             ; signal success
+       (progn 
+         (vc-file-setprop file 'vc-state 'conflict)
+         ;; signal error
+         1)
+      (vc-file-setprop file 'vc-state 'edited)
+      ;; signal success
+      0)))
 
 (defun vc-cvs-merge-news (file)
   "Merge in any new changes made to FILE."
@@ -478,7 +483,7 @@
                 0);; indicate success to the caller
                ;; Conflicts detected!
                (t
-                (vc-file-setprop file 'vc-state 'edited)
+                (vc-file-setprop file 'vc-state 'conflict)
                 1);; signal the error to the caller
                )
             (pop-to-buffer "*vc*")
@@ -814,7 +819,7 @@
        (if (not (re-search-forward "\\=[ \t]+Status: \\(.*\\)" nil t))
            (setq status "Unknown")
          (setq status (match-string 1)))
-       (if (and full
+       (when (and full
                 (re-search-forward
                  "\\(RCS Version\\|RCS Revision\\|Repository revision\\):\
 \[\t ]+\\([0-9.]+\\)"
@@ -833,6 +838,7 @@
           (if missing 'missing 'needs-patch))
          ((string-match "Locally Added" status)                'added)
          ((string-match "Locally Removed" status)              'removed)
+         ((string-match "File had conflicts " status)          'conflict)
          (t 'edited))))))))
 
 (defun vc-cvs-dir-state-heuristic (dir)
@@ -897,6 +903,7 @@
                    (if missing 'missing 'needs-patch))
                   ((string-match "Locally Added" status-str) 'added)
                   ((string-match "Locally Removed" status-str) 'removed)
+                  ((string-match "File had conflicts " status-str) 'conflict)
                   (t 'edited)))
            (unless (eq status 'up-to-date)
              (push (list file status) result))))))