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: Thu, 28 Jan 2010 00:55:10 -0500 Message-ID: References: <87tyzs4hln.fsf@urmel.duenenhof-wilhelm.de> <87pr4wfamw.fsf@stupidchicken.com> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264659023 30137 80.91.229.12 (28 Jan 2010 06:10:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 06:10:23 +0000 (UTC) To: 4280-done@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jan 28 07:10:20 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.69) (envelope-from ) id 1NaNa5-0008K6-0T for geb-bug-gnu-emacs@m.gmane.org; Thu, 28 Jan 2010 07:10:17 +0100 Original-Received: from localhost ([127.0.0.1]:47235 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaNa4-0005fa-CQ for geb-bug-gnu-emacs@m.gmane.org; Thu, 28 Jan 2010 01:10:16 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaNZs-0005df-A5 for bug-gnu-emacs@gnu.org; Thu, 28 Jan 2010 01:10:04 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaNZn-0005cP-DY for bug-gnu-emacs@gnu.org; Thu, 28 Jan 2010 01:10:03 -0500 Original-Received: from [199.232.76.173] (port=47319 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaNZn-0005cL-4I for bug-gnu-emacs@gnu.org; Thu, 28 Jan 2010 01:09:59 -0500 Original-Received: from debbugs.gnu.org ([140.186.70.43]:57161) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NaNZk-0006XB-H8 for bug-gnu-emacs@gnu.org; Thu, 28 Jan 2010 01:09:56 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.69) (envelope-from ) id 1NaNMH-0000r4-RW for bug-gnu-emacs@gnu.org; Thu, 28 Jan 2010 00:56:01 -0500 Resent-From: Glenn Morris Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 28 Jan 2010 05:56:01 +0000 Resent-Message-ID: Resent-Sender: bug-gnu-emacs@gnu.org Mail-Followup-To: 4280@debbugs.gnu.org, Glenn Morris X-Emacs-PR-Message: cc-closed 4280 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4280-done@debbugs.gnu.org id=D4280.12646581163266 (code D ref 4280); Thu, 28 Jan 2010 05:56:01 +0000 Original-Received: (at 4280-done) by debbugs.gnu.org; 28 Jan 2010 05:55:16 +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 1NaNLX-0000qd-8R for submit@debbugs.gnu.org; Thu, 28 Jan 2010 00:55:15 -0500 Original-Received: from fencepost.gnu.org ([140.186.70.10]) by debbugs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1NaNLV-0000qW-WA for 4280-done@debbugs.gnu.org; Thu, 28 Jan 2010 00:55:14 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.69) (envelope-from ) id 1NaNLS-0005pF-PF; Thu, 28 Jan 2010 00:55:10 -0500 X-Spook: NASA 9/11 Area 51 Europol Hamas SHA Consul import X-Ran: Od.PXv}=eu?IW#:xJpie-v;Hri,l\K<`#?r/b+:~q>|ayQQ|cABWV#6{k'EDuV)|pCn9\5 X-Hue: yellow X-Attribution: GM In-Reply-To: <87pr4wfamw.fsf@stupidchicken.com> (Chong Yidong's message of "Tue\, 26 Jan 2010 23\:13\:27 -0500") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-Spam-Score: -5.9 (-----) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.11 Precedence: list X-Spam-Score: -5.9 (-----) Resent-Date: Thu, 28 Jan 2010 00:56:01 -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:34769 Archived-At: * vc-svn.el (vc-svn-update): Use "svn --non-interactive".