* vc.el (vc-update): Resolve conflicts if necessary instead of

just updating the buffer.

* vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
update command so that we can parse the output.

3 files changed, 10 insertions, 3 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f30ec291583..3e9da0593db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-13  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * vc.el (vc-update): Resolve conflicts if necessary instead of
+        just updating the buffer.
+
+        * vc-cvs.el (vc-cvs-merge-news): Ignore the error status of the
+        update command so that we can parse the output.
+
 2008-01-13  Martin Rudalics  <rudalics@gmx.at>
 
         * mail/rmail.el (rmail-convert-to-babyl-format): Remove
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index d84c2839573..cc4cd47cfe7 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -453,7 +453,7 @@ The changes are between FIRST-REVISION and SECOND-REVISION."
   (message "Merging changes into %s..." file)
   ;; (vc-file-setprop file 'vc-working-revision nil)
   (vc-file-setprop file 'vc-checkout-time 0)
-  (vc-cvs-command nil 0 file "update")
+  (vc-cvs-command nil nil file "update")
   ;; Analyze the merge result reported by CVS, and set
   ;; file properties accordingly.
   (with-current-buffer (get-buffer "*vc*")
diff --git a/lisp/vc.el b/lisp/vc.el
index 88915f3715f..5006af37ec5 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -2899,8 +2899,7 @@ changes from the current branch are merged into the working file."
         (if (not (vc-find-backend-function (vc-backend file) 'merge-news))
             (error "Sorry, merging news is not implemented for %s"
                    (vc-backend file))
-          (vc-call merge-news file)
-          (vc-resynch-buffer file t t))))))
+          (vc-maybe-resolve-conflicts file (vc-call merge-news file)))))))
 
 (defun vc-version-backup-file (file &optional rev)
   "Return name of backup file for revision REV of FILE.