# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1286135034 25200
# Node ID c93b5b77a985c95230a6935a0b1b467240a14262
# Parent  eb0cb131cf0683493304b453ee82704e93594fda
* lisp/vc-svn.el (vc-svn-merge-news): Use --non-interactive.  (Bug#7152)

diff -r eb0cb131cf06 -r c93b5b77a985 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Oct 03 11:23:07 2010 +0200
+++ b/lisp/ChangeLog	Sun Oct 03 12:43:54 2010 -0700
@@ -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 -r eb0cb131cf06 -r c93b5b77a985 lisp/vc-svn.el
--- a/lisp/vc-svn.el	Sun Oct 03 11:23:07 2010 +0200
+++ b/lisp/vc-svn.el	Sun Oct 03 12:43:54 2010 -0700
@@ -373,7 +373,7 @@
   (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*")