From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?utf-8?Q?=C3=93scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Thu, 28 Jan 2010 20:57:24 +0100 Message-ID: <873a1qt32z.fsf@telefonica.net> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> <87eilat62r.fsf@telefonica.net> <83eilat4g7.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1264708691 23506 80.91.229.12 (28 Jan 2010 19:58:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 19:58:11 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 20:58:09 2010 Return-path: Envelope-to: ged-emacs-devel@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 1NaaVE-0004Kq-LK for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 20:58:08 +0100 Original-Received: from localhost ([127.0.0.1]:33301 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaaVE-0004hN-5X for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 14:58:08 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaaV8-0004fz-Mf for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:58:02 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaaV4-0004a0-1j for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:58:02 -0500 Original-Received: from [199.232.76.173] (port=33167 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaaV3-0004Zk-Q9 for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:57:57 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:54958) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaaV0-0007Wd-Cl for emacs-devel@gnu.org; Thu, 28 Jan 2010 14:57:57 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NaaUr-000444-S6 for emacs-devel@gnu.org; Thu, 28 Jan 2010 20:57:45 +0100 Original-Received: from 92.red-88-24-231.staticip.rima-tde.net ([88.24.231.92]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 28 Jan 2010 20:57:45 +0100 Original-Received: from ofv by 92.red-88-24-231.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 28 Jan 2010 20:57:45 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 30 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 92.red-88-24-231.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:Z+UNb5zFKQ8BiJxgkhHuACnGniU= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:120612 Archived-At: Eli Zaretskii writes: > Are you saying that this happened because a "merge" was not followed > by a "commit", and only because of that? Jan tried to commit after the merge, but somehow VC-dir passed some file names to the command instead of doing a non-selective commit as he intended. [snip] >> So it is documented. Maybe VC could detect if there are pending merges >> parsing the output of `bzr st', or parse the error message returned by >> `bzr commit somefile' and detect that the failure was due to a pending >> merge > > And then do what? Report that circumstance to the user? But probably showing the error msg reported by bzr is enough, and IIRC VC already does this. >> What bzr shouldn't do is to output a backtrace. I'll file a bug report >> for that. > > That was a backtrace in .bzr.log, no? What's wrong with that? Nothing. I checked that the backtrace does not show in the console, so it is fine.