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 19:52:44 +0100 Message-ID: <87eilat62r.fsf@telefonica.net> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> <87vdemtk4g.fsf@telefonica.net> <837hr23wrs.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1264704820 28598 80.91.229.12 (28 Jan 2010 18:53:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 18:53:40 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 19:53:34 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 1NaZUg-0005OR-OF for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 19:53:31 +0100 Original-Received: from localhost ([127.0.0.1]:46971 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaZUg-0004uB-9K for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 13:53:30 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaZUc-0004tU-4Q for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:53:26 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaZUX-0004rc-Gn for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:53:25 -0500 Original-Received: from [199.232.76.173] (port=46555 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaZUX-0004rZ-DW for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:53:21 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:44723) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaZUW-0008WC-UK for emacs-devel@gnu.org; Thu, 28 Jan 2010 13:53:21 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NaZUL-00055q-Tk for emacs-devel@gnu.org; Thu, 28 Jan 2010 19:53:09 +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 19:53:09 +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 19:53:09 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 39 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:zGSOOxtXoDbnAX0ww9Z8hLeNUEQ= 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:120598 Archived-At: Eli Zaretskii writes: >> From: Óscar Fuentes >> Date: Thu, 28 Jan 2010 14:49:19 +0100 >> >> cd trunk >> bzr merge ../other-branch >> >> >> >> As mentioned on my response to Jason, it seems that bzr does not admit a >> `commit' comand with a list of files when there is a pending merge. > > Óscar, could you please ask on the Bazaar list if this is true, and > what can be done to work around that, so that VC could DTRT? >From `bzr help commit' : >>>>>>>>> Selective commits: If selected files are specified, only changes to those files are committed. If a directory is specified then the directory and everything within it is committed. ... A selective commit after a merge is not yet supported. <<<<<<<<< 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, hoping it is not translated to the local language etc. In any case, it would require an ugly Bazaar-specific hack. What bzr shouldn't do is to output a backtrace. I'll file a bug report for that. [snip]