Function: vc-svn-merge

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

Signature

(vc-svn-merge FILE FIRST-VERSION &optional SECOND-VERSION)

Documentation

Merge changes into current working copy of FILE.

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

Source Code

;; Defined in /usr/src/emacs/lisp/vc/vc-svn.el.gz
(defun vc-svn-merge (file first-version &optional second-version)
  "Merge changes into current working copy of FILE.
The changes are between FIRST-VERSION and SECOND-VERSION."
  (vc-svn-command nil 0 file
                 "merge"
		 "-r" (if second-version
			(concat first-version ":" second-version)
		      first-version))
  (vc-file-setprop file 'vc-state 'edited)
  (with-current-buffer "*vc*"
    (goto-char (point-min))
    (if (looking-at "C  ")
        1				; signal conflict
      0)))				; signal success