andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Olof Ohlsson Sax 2010-10-03 12:43:54 -07:00 • committed by Glenn Morris
parent a79b0f2863
commit 8686a5eafc
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -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

2
lisp/vc-svn.el
View file

@ -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*")