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 21:35:45 +0200 Message-ID: <837hrn86b2.fsf@gnu.org> References: <4B4B93AB.3030903@gnu.org> <87skac1fy7.fsf@telefonica.net> <4B4C28F6.9000209@swipnet.se> Reply-To: Eli Zaretskii 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 1263325380 26574 80.91.229.12 (12 Jan 2010 19:43:00 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 12 Jan 2010 19:43:00 +0000 (UTC) Cc: ofv@wanadoo.es, emacs-devel@gnu.org To: =?UTF-8?B?SmFuIERqw6Rydg==?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jan 12 20:42:52 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 1NUmdg-0003XT-7t for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 20:42:52 +0100 Original-Received: from localhost ([127.0.0.1]:41815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUmdg-0000AY-Rn for ged-emacs-devel@m.gmane.org; Tue, 12 Jan 2010 14:42:52 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NUmWv-000518-Fl for emacs-devel@gnu.org; Tue, 12 Jan 2010 14:35:53 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NUmWr-0004xn-Mt for emacs-devel@gnu.org; Tue, 12 Jan 2010 14:35:53 -0500 Original-Received: from [199.232.76.173] (port=57896 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NUmWr-0004xa-KN for emacs-devel@gnu.org; Tue, 12 Jan 2010 14:35:49 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:53236) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NUmWq-0003h8-NC for emacs-devel@gnu.org; Tue, 12 Jan 2010 14:35:49 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0KW500L00FJX8P00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Tue, 12 Jan 2010 21:35:07 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([77.126.60.183]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KW500I66FQID6A0@a-mtaout21.012.net.il>; Tue, 12 Jan 2010 21:35:07 +0200 (IST) In-reply-to: <4B4C28F6.9000209@swipnet.se> 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:119879 Archived-At: > Date: Tue, 12 Jan 2010 08:47:02 +0100 > From: Jan Dj=C3=A4rv > Cc: emacs-devel@gnu.org >=20 > To assume that one can always beforehand descide if one is about to= do a=20 > quickfix or not is also too simple minded. You don't need to decide in advance. Start in the trunk or in quickfix, and if you later see that a separate branch is required, then bzr branch trunk fix-something cd fix-something bzr merge ../trunk --uncommitted cd ../trunk bzr revert cd ../fix-something [and hack in the `fix-something' branch] This copies uncommitted changes from trunk to a newly created branch, then reverts the trunk to its previous pristine state, before you started your not-so-simple fix.