Mercurial > emacs
changeset 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 | 8da4f8bf7244 |
| children | 5bd86dfd3e39 |
| files | lisp/ChangeLog lisp/vc-cvs.el lisp/vc.el |
| diffstat | 3 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Jan 13 18:29:53 2008 +0000 +++ b/lisp/ChangeLog Sun Jan 13 20:03:35 2008 +0000 @@ -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
--- 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*")
--- a/lisp/vc.el Sun Jan 13 18:29:53 2008 +0000 +++ b/lisp/vc.el Sun Jan 13 20:03:35 2008 +0000 @@ -2899,8 +2899,7 @@ (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.