[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100081: * lisp/vc-svn.el (vc-svn-merge-news): Use --non-interactive. (Bug#7152)

[Glenn Morris]

------------------------------------------------------------
revno: 100081
author: Olof Ohlsson Sax <address@hidden>
committer: Glenn Morris <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-10-03 12:43:54 -0700
message:
  * lisp/vc-svn.el (vc-svn-merge-news): Use --non-interactive.  (Bug#7152)
modified:
  lisp/ChangeLog
  lisp/vc-svn.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-03 01:27:39 +0000
+++ b/lisp/ChangeLog    2010-10-03 19:43:54 +0000
@@ -1,3 +1,7 @@
+2010-10-03  Olof Ohlsson Sax  <address@hidden>  (tiny change)
+
+       * vc-svn.el (vc-svn-merge-news): Use --non-interactive.  (Bug#7152)
+
 2010-10-03  Leo  <address@hidden>
 
        * dnd.el (dnd-get-local-file-name): If MUST-EXIST is non-nil, only

=== modified file 'lisp/vc-svn.el'
--- a/lisp/vc-svn.el    2010-06-12 07:34:36 +0000
+++ b/lisp/vc-svn.el    2010-10-03 19:43:54 +0000
@@ -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*")