From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: bzr workflow Date: Tue, 12 Jan 2010 00:08:42 +0200 Message-ID: <83aawk8fbp.fsf@gnu.org> References: <4B4B93AB.3030903@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1263247745 18805 80.91.229.12 (11 Jan 2010 22:09:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 11 Jan 2010 22:09:05 +0000 (UTC) Cc: emacs-devel@gnu.org To: Sam Steingold Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Jan 11 23:08:58 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 1NUSRV-0000iX-M6 for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 23:08:57 +0100 Original-Received: from localhost ([127.0.0.1]:53847 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUSRW-00019Q-7o for ged-emacs-devel@m.gmane.org; Mon, 11 Jan 2010 17:08:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUSRP-00017M-26 for emacs-devel@gnu.org; Mon, 11 Jan 2010 17:08:51 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUSRK-0000zB-6K for emacs-devel@gnu.org; Mon, 11 Jan 2010 17:08:50 -0500 Original-Received: from [199.232.76.173] (port=51466 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUSRJ-0000yt-LD for emacs-devel@gnu.org; Mon, 11 Jan 2010 17:08:45 -0500 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:55519) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUSRG-0003Ss-SS; Mon, 11 Jan 2010 17:08:43 -0500 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0KW300E00RYRPR00@a-mtaout23.012.net.il>; Tue, 12 Jan 2010 00:08:06 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.127.222.44]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KW300DVTS5H8W70@a-mtaout23.012.net.il>; Tue, 12 Jan 2010 00:08:06 +0200 (IST) In-reply-to: <4B4B93AB.3030903@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by monty-python.gnu.org: Solaris 10 (beta) 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:119835 Archived-At: > From: Sam Steingold > Date: Mon, 11 Jan 2010 16:10:03 -0500 > > 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)." It's not twice, it's n+1, where n is the number of commits you do on the quickfixes branch while you work on the change, and the +1 is to merge with upstream before you send the changes to the remote repository on Savannah. For serious development, you will want that, and you cannot avoid the last merge with upstream, of course, for obvious reasons. As others told you, if your "quick fix" is just a simple change, it doesn't need a separate branch. FWIW, I make such changes directly in the trunk tree, and then the workflow looks very similar to CVS: just hack, test, and commit once, which commits to the remote repository as well as the local one.