* lisp/vc-svn.el (vc-svn-merge-news): Use --non-interactive. (Bug#7152)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index acc2e0c382f9e39f83d64a682169296a44c8dbb3..84162ef502df89b7c48b5c5e86372dcaba6a39e7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-03  Olof Ohlsson Sax  <olof.ohlsson.sax@gmail.com>  (tiny change)
+
+       * vc-svn.el (vc-svn-merge-news): Use --non-interactive.  (Bug#7152)
+
 2010-10-03  Leo  <sdl.web@gmail.com>
 
        * dnd.el (dnd-get-local-file-name): If MUST-EXIST is non-nil, only

diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 34ebc3bb949124fee9083c8e1c258203f1573e4e..7b95c2a214d60341132aef61283b4304a1d536d2 100644 (file)
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -373,7 +373,7 @@ The changes are between FIRST-VERSION and SECOND-VERSION."
   (message "Merging changes into %s..." file)
   ;; (vc-file-setprop file 'vc-working-revision nil)
   (vc-file-setprop file 'vc-checkout-time 0)
-  (vc-svn-command nil 0 file "update")
+  (vc-svn-command nil 0 file "--non-interactive" "update") ; see bug#7152
   ;; Analyze the merge result reported by SVN, and set
   ;; file properties accordingly.
   (with-current-buffer (get-buffer "*vc*")