From 8686a5eafc46055d39c30104ebe209a100940f1c Mon Sep 17 00:00:00 2001 From: Olof Ohlsson Sax Date: Sun, 3 Oct 2010 12:43:54 -0700 Subject: [PATCH] * lisp/vc-svn.el (vc-svn-merge-news): Use --non-interactive. (Bug#7152) --- lisp/ChangeLog | 4 ++++ lisp/vc-svn.el | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index acc2e0c382f..84162ef502d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2010-10-03 Olof Ohlsson Sax (tiny change) + + * vc-svn.el (vc-svn-merge-news): Use --non-interactive. (Bug#7152) + 2010-10-03 Leo * 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 34ebc3bb949..7b95c2a214d 100644 --- 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*") -- 2.39.2