Mercurial > emacs
diff lisp/vc-cvs.el @ 87739:28dc34f6a246
* 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 13 Jan 2008 20:03:35 +0000 |
| parents | 107ccd98fa12 |
| children | c70e45a7acfd 7bc22dad5f9a |
line wrap: on
line diff
--- a/lisp/vc-cvs.el Sun Jan 13 18:29:53 2008 +0000 +++ b/lisp/vc-cvs.el Sun Jan 13 20:03:35 2008 +0000 @@ -453,7 +453,7 @@ (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*")