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: bzr workflow Date: Mon, 11 Jan 2010 22:37:04 +0100 Message-ID: <87skac1fy7.fsf@telefonica.net> References: <4B4B93AB.3030903@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 1263245987 12230 80.91.229.12 (11 Jan 2010 21:39:47 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Jan 2010 21:39:47 +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:39:40 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 1NURzA-0004gB-43 for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 22:39:40 +0100 Original-Received: from localhost ([127.0.0.1]:47217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NURzA-0000AE-QA for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 16:39:40 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NURyE-0008HV-1l for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:38:42 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NURy9-0008G3-9x for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:38:41 -0500 Original-Received: from [199.232.76.173] (port=39694 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NURy8-0008Fx-VM for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:38:37 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:58631) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NURy8-0002Sc-Hg for emacs-devel@gnu.org; Mon, 11 Jan 2010 16:38:36 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NURxY-0003fq-NW for emacs-devel@gnu.org; Mon, 11 Jan 2010 22:38:00 +0100 Original-Received: from 138.red-83-45-255.dynamicip.rima-tde.net ([83.45.255.138]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 11 Jan 2010 22:38:00 +0100 Original-Received: from ofv by 138.red-83-45-255.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 11 Jan 2010 22:38:00 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 50 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 138.red-83-45-255.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.91 (gnu/linux) Cancel-Lock: sha1:Dzmls/OKpwdSHzPojw4zUNqkqdc= 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:119832 Archived-At: Sam Steingold writes: > http://www.emacswiki.org/emacs/BzrForEmacsDevs > appears to indicate that I need to commit _twice_ for each change (with the > same log message?): This was extensively discussed here a few days ago. > 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? No, you are not alone. You can use http://www.emacswiki.org/emacs/BzrQuickStartForEmacsDevs or a variation of it as described below. There is something that I disagree with BzrForEmacsDevs: a quickfix that requires more than one commit or that spans so long in time to warrant a merge from upstream does not qualify as a quickfix for me. For the people that works with the distributed workflow and thinks that a quickfix should map to one and only one commit, there is an easy solution: bind your quickfixes/ branch to upstream: cd quickfixes/ bzr bind URL_TO_UPSTREAM/trunk after this, your workflow for quick fixes becomes: bzr up bzr commit -m "Fix bla bla bla (closes Bug #1)." and you can use VC-dir all along. [snip] -- Óscar