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 12:26:07 +0100 Message-ID: <87bpgev5bk.fsf@telefonica.net> References: <4B613BFB.2000107@swipnet.se> 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 1264678215 20742 80.91.229.12 (28 Jan 2010 11:30:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 11:30:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 12:30:12 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 1NaSZd-00049H-MO for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 12:30:10 +0100 Original-Received: from localhost ([127.0.0.1]:39847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaSZd-0003rL-23 for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 06:30:09 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaSWD-00024Z-Em for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:26:37 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaSW8-00022i-Cx for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:26:37 -0500 Original-Received: from [199.232.76.173] (port=54910 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaSW8-00022c-8w for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:26:32 -0500 Original-Received: from mx20.gnu.org ([199.232.41.8]:29346) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NaSW7-0002bz-RI for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:26:31 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaSW6-0007QB-IF for emacs-devel@gnu.org; Thu, 28 Jan 2010 06:26:30 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1NaSW3-0000yh-L9 for emacs-devel@gnu.org; Thu, 28 Jan 2010 12:26:27 +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 12:26:27 +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 12:26:27 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 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:PJhKGYJtMUMafYl7QCXdxO/ly/8= X-detected-operating-system: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:120560 Archived-At: Jan Djärv writes: > Maybe I'm missing something obvious, but I can't find any way of doing > commit from vc in Emacs (for bzr). > > I did what "Doing Quick Fixes" says in BzrForEmacsDevs. I then did > C-x v d ..., and then v, C-c C-c. > > Bzr then complains it can't do single file commits for merges > (whatever that means). Let me guess: bzr merge bzr commit foo.c On this scenario, the `merge' modifies some files and sets a `pending merge tips' status flag (visible with `bzr st') At this point, you must commit the whole merge, not just a subset of the modified files: bzr merge bzr commit bzr commit foo.c