From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#4280: vc-update fails under conflicts Date: Tue, 26 Jan 2010 21:48:55 -0500 Message-ID: References: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264561876 11077 80.91.229.12 (27 Jan 2010 03:11:16 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 27 Jan 2010 03:11:16 +0000 (UTC) To: 4280@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jan 27 04:11:08 2010 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1NZyJ8-0002pC-RP for geb-bug-gnu-emacs@m.gmane.org; Wed, 27 Jan 2010 04:11:07 +0100 Original-Received: from localhost ([127.0.0.1]:36490 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZyJ9-00042l-LC for geb-bug-gnu-emacs@m.gmane.org; Tue, 26 Jan 2010 22:11:07 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NZyI1-00030D-NA for bug-gnu-emacs@gnu.org; Tue, 26 Jan 2010 22:09:57 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NZyHw-0002uA-Tv for bug-gnu-emacs@gnu.org; Tue, 26 Jan 2010 22:09:57 -0500 Original-Received: from [199.232.76.173] (port=50499 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NZyHw-0002tw-P0 for bug-gnu-emacs@gnu.org; Tue, 26 Jan 2010 22:09:52 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:37836) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NZyHw-0008B2-EF for bug-gnu-emacs@gnu.org; Tue, 26 Jan 2010 22:09:52 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NZxxn-0003XF-Hc; Tue, 26 Jan 2010 21:49:03 -0500 X-Loop: bug-gnu-emacs@gnu.org Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: owner@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 27 Jan 2010 02:49:03 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org X-Emacs-PR-Message: followup 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4280-submit@debbugs.gnu.org id=B4280.126456054213586 (code B ref 4280); Wed, 27 Jan 2010 02:49:03 +0000 Original-Received: (at 4280) by debbugs.gnu.org; 27 Jan 2010 02:49:02 +0000 Original-Received: from localhost ([127.0.0.1] helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NZxxl-0003X2-N7 for submit@debbugs.gnu.org; Tue, 26 Jan 2010 21:49:01 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NZxxj-0003Wx-EG for 4280@debbugs.gnu.org; Tue, 26 Jan 2010 21:48:59 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NZxxf-00027P-PL; Tue, 26 Jan 2010 21:48:55 -0500 X-Spook: Semtex Taiwan bullion bomb Rubin USCODE clones NORAD X-Ran: (Dieter Wilhelm's message of "Fri\, 28 Aug 2009 07\:45\:08 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-Spam-Score: -6.0 (------) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list X-Spam-Score: -6.0 (------) Resent-Date: Tue, 26 Jan 2010 21:49:03 -0500 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:34742 Archived-At: Dieter Wilhelm wrote: > When using vc-update I'm receiving the following error message in *vc*: > > Conflict discovered in 'ansys-mode.el'. > Select: (p) postpone, (df) diff-full, (e) edit, > (h) help for more options: svn: Can't read stdin: End of file found It seems that in recent versions of svn, `svn update' defaults to offering this "interactive conflict resolution". It can be disabled by passing the --non-interactive option to svn. This option seems to have been first added to svn in 2002, so it's probably fine to use this unconditionally in vc-svn.el.