From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Rumney Newsgroups: gmane.emacs.devel Subject: Re: No commit in vc? Date: Thu, 28 Jan 2010 21:22:01 +0800 Message-ID: <87hbq64b5y.fsf@wanchan.jasonrumney.net> References: <4B613BFB.2000107@swipnet.se> <87bpgev5bk.fsf@telefonica.net> <4B618AA4.1040403@swipnet.se> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1264684952 15254 80.91.229.12 (28 Jan 2010 13:22:32 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 28 Jan 2010 13:22:32 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , emacs-devel@gnu.org To: Jan =?utf-8?Q?Dj=C3=A4rv?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Jan 28 14:22:27 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 1NaUKE-0000fz-ID for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 14:22:22 +0100 Original-Received: from localhost ([127.0.0.1]:51961 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaUKD-0000bH-Tq for ged-emacs-devel@m.gmane.org; Thu, 28 Jan 2010 08:22:21 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NaUK8-0000bC-K3 for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:22:16 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NaUK3-0000Y8-UL for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:22:16 -0500 Original-Received: from [199.232.76.173] (port=46024 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NaUK3-0000Y0-Ru for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:22:11 -0500 Original-Received: from mail-yw0-f189.google.com ([209.85.211.189]:39133) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NaUK3-0007Xb-F2 for emacs-devel@gnu.org; Thu, 28 Jan 2010 08:22:11 -0500 Original-Received: by ywh27 with SMTP id 27so551073ywh.1 for ; Thu, 28 Jan 2010 05:22:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:received:from:to:cc :subject:references:date:in-reply-to:message-id:user-agent :mime-version:content-type:content-transfer-encoding; bh=QQlW9Kb41dhp0CBsDxqxdGsUloWVQeUkA1RXde+Aqo0=; b=sWVE9FtioMqQfJyy+mZJ26zwy2IJXiPi2OFOegCSRUOUJY0i5pQoWBVLwGV3NgYKXn RVA1InUfQ5ek9AzVHVn2iTik+G1mQ08pmieAcVufsUoF6I02XiHtgzMM1cMY/dbIjN6o Be/v5ttfQqEcxFC//Ec1ZjRpbID+80mcTLJtw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type:content-transfer-encoding; b=N9YUjeFuWve/7HVoY/1mpbT+/7Hom07qzwMGwrQUPByPwY/GugLBAbsTMOcO4+HjZg pBeFyLVeg9UtvX+i/yhroR7Su48L44JdXF2R0Hp5y5Kt1IzT99d28Iv0GSvOjPWaC/Wd UMwN8B2NgMJoBQ3QhFjAnM7kf5K2hrQgYa2v4= Original-Received: by 10.100.192.4 with SMTP id p4mr9087105anf.73.1264684929252; Thu, 28 Jan 2010 05:22:09 -0800 (PST) Original-Received: from wanchan.jasonrumney.net ([202.87.221.133]) by mx.google.com with ESMTPS id 8sm334882yxg.24.2010.01.28.05.22.06 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 28 Jan 2010 05:22:06 -0800 (PST) Original-Received: by wanchan.jasonrumney.net (Postfix, from userid 1000) id BA88F1E6B; Thu, 28 Jan 2010 21:22:01 +0800 (MYT) In-Reply-To: <4B618AA4.1040403@swipnet.se> ("Jan =?utf-8?Q?Dj=C3=A4rv=22's?= message of "Thu, 28 Jan 2010 14:01:24 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:120572 Archived-At: Jan Dj=C3=A4rv 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). The same happened to me yesterday. My sequence was Edit in local branch, as recommended. Commit. In trunk: bzr update bzr merge ../branch >From Emacs C-x v d Mark all edited files. Type v. Use vc specialised functions to pull the Changelog into the commit message, add an extra one liner at the top. C-c C-c Bzr complains about single file commits. Really, this needs to be made to work, and the frequent respondants to queries such as this need to be less condescending toward the people reporting these problems and admit that the tools need improving to match the workflow expected by the users, not the other way around!