Mercurial > emacs

changeset 50822:0be6233722ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(vc-svn-merge): First attempt.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 05 May 2003 16:13:04 +0000
parents 33e415a24bb5
children 83c8010f1eb2
files lisp/vc-svn.el
diffstat 1 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/vc-svn.el	Mon May 05 16:06:10 2003 +0000
+++ b/lisp/vc-svn.el	Mon May 05 16:13:04 2003 +0000
@@ -328,14 +328,15 @@
   "Merge changes into current working copy of FILE.
 The changes are between FIRST-VERSION and SECOND-VERSION."
   (vc-svn-command nil 0 file
-                 "update" "-kk"
-                 (concat "-j" first-version)
-                 (concat "-j" second-version))
+                 "merge"
+		 -r (if second-version
+			(concat first-version ":" second-version)
+		      first-version))
   (vc-file-setprop file 'vc-state 'edited)
   (with-current-buffer (get-buffer "*vc*")
     (goto-char (point-min))
-    (if (re-search-forward "conflicts during merge" nil t)
-        1				; signal error
+    (if (looking-at "C  ")
+        1				; signal conflict
       0)))				; signal success
 
 (defun vc-svn-merge-news (file)