From c217cb045280290f1cf77bdd3fe864ee8bd8b76c Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Mon, 5 May 2003 16:13:04 +0000
Subject: (vc-svn-merge): First attempt.
---
lisp/vc-svn.el | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
(limited to 'lisp/vc-svn.el')
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 031ca0d9018..571f5c8d030 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -328,14 +328,15 @@ This is only possible if SVN is responsible for FILE's directory.")
"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)
--
cgit v1.2.1