From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sam Steingold Newsgroups: gmane.emacs.devel Subject: bzr workflow Date: Mon, 11 Jan 2010 16:10:03 -0500 Message-ID: <4B4B93AB.3030903@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1263244371 6029 80.91.229.12 (11 Jan 2010 21:12:51 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Jan 2010 21:12:51 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 11 22:12:44 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.50) id 1NURZ5-0004f4-7C for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 22:12:43 +0100 Original-Received: from localhost ([127.0.0.1]:36381 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NURZ5-0002SD-DH for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 16:12:43 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NURXG-0001Um-Vu for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:10:51 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NURX7-0001LA-4M for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:10:45 -0500 Original-Received: from [199.232.76.173] (port=56996 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NURX4-0001JE-OS for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:10:39 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:54806) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NURX4-00025z-At for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:10:38 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NURWy-0003aV-Tq for emacs-devel@gnu.org; Mon, 11 Jan 2010 22:10:32 +0100 Original-Received: from 38.105.200.250 ([38.105.200.250]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 11 Jan 2010 22:10:32 +0100 Original-Received: from sds by 38.105.200.250 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 11 Jan 2010 22:10:32 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 27 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 38.105.200.250 User-Agent: Thunderbird 2.0.0.22 (X11/20090625) X-Enigmail-Version: 0.95.6 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:119830 Archived-At: http://www.emacswiki.org/emacs/BzrForEmacsDevs appears to indicate that I need to commit _twice_ for each change (with the same log message?): Workflow for a Quick Change ... bzr commit -m "Fix bla bla bla (closes Bug #1)." Merging Into the Upstream Master ... bzr merge bzr commit -m "Merge: fix bla bla bla (closes Bug #1)." 1. Am I the only one who thinks this is a little too convoluted? (the only other DVC I regularly use is hg, and there the workflow is "commit+push" instead of the recommended emacs workflow "commit+merge+commit"). 2. Is there a way to emacs-automate this? I.e., the first commit is easily done from under emacs using the vc-dir buffer: mark the files, hit C-x v v to the to the commit message buffer, then C-c C-a will insert the ChangeLog text and C-c C-c will commit. Then I have to switch to a bash window, go to trunk, then merge, and the then commit - but then I need either a second vc-dir buffer in emacs, or I need to do that (a multi-line commit message!) from the shell. There must be a better way to do that! thanks.