Function: vc-cvs-merge

vc-cvs-merge is a byte-compiled function defined in vc-cvs.el.gz.

Signature

(vc-cvs-merge FILE FIRST-REVISION &optional SECOND-REVISION)

Documentation

Merge changes into current working copy of FILE.

The changes are between FIRST-REVISION and SECOND-REVISION.

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-cvs.el.gz
(defun vc-cvs-merge (file first-revision &optional second-revision)
  "Merge changes into current working copy of FILE.
The changes are between FIRST-REVISION and SECOND-REVISION."
  (vc-cvs-command nil 0 file
                 "update" "-kk"
                 (concat "-j" first-revision)
                 (concat "-j" second-revision))
  (vc-file-setprop file 'vc-state 'edited)
  (with-current-buffer "*vc*"
    (goto-char (point-min))
    (if (re-search-forward "conflicts during merge" nil t)
	(progn
	  (vc-file-setprop file 'vc-state 'conflict)
	  ;; signal error
	  1)
      (vc-file-setprop file 'vc-state 'edited)
      ;; signal success
      0)))