# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1052151184 0
# Node ID 0be6233722ec70c4cce9d3e1f49db1a4ae0c301b
# Parent  33e415a24bb5598cad66d010f51f80ae12a5953e
(vc-svn-merge): First attempt.

diff -r 33e415a24bb5 -r 0be6233722ec lisp/vc-svn.el
--- 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)