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: Locks on the Bzr repository Date: Tue, 24 Aug 2010 19:59:36 +0300 Message-ID: <837hjgndzb.fsf@gnu.org> References: <4C6D56DB.7040703@swipnet.se> <4C6D8EC5.7040901@swipnet.se> <4C6E1F0A.7070506@swipnet.se> <837hjlr78p.fsf@gnu.org> <87zkwhtws5.fsf@uwakimon.sk.tsukuba.ac.jp> <83tymppj62.fsf@gnu.org> <871v9t8klf.fsf@uwakimon.sk.tsukuba.ac.jp> <83lj81pazq.fsf@gnu.org> <83aaogpcbu.fsf@gnu.org> <87vd737pxd.fsf@uwakimon.sk.tsukuba.ac.jp> <83pqxboi38.fsf@gnu.org> <19568.59349.718000.978281@gargle.gargle.HOWL> <19570.10774.921000.853692@gargle.gargle.HOWL> <878w3x7h8u.fsf@uwakimon.sk.tsukuba.ac.jp> <19570.27753.731000.392172@gargle.gargle.HOWL> <87zkwc5xnr.fsf@uwakimon.sk.tsukuba.ac.jp> <86hbikxk3k.wl%lluis@fulla.xlab.taz> <87occs5cg3.fsf@uwakimon.sk.tsukuba.ac.jp> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1282669066 1462 80.91.229.12 (24 Aug 2010 16:57:46 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 24 Aug 2010 16:57:46 +0000 (UTC) Cc: xscript@gmx.net, emacs-devel@gnu.org To: "Stephen J. Turnbull" Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 24 18:57: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.69) (envelope-from ) id 1Onwoi-0000KA-BK for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 18:57:44 +0200 Original-Received: from localhost ([127.0.0.1]:52841 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Onwoh-0000mN-Mc for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 12:57:43 -0400 Original-Received: from [140.186.70.92] (port=59171 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OnwoY-0000mH-46 for emacs-devel@gnu.org; Tue, 24 Aug 2010 12:57:38 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OnwoW-0006er-SA for emacs-devel@gnu.org; Tue, 24 Aug 2010 12:57:33 -0400 Original-Received: from mtaout20.012.net.il ([80.179.55.166]:42504) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OnwoW-0006ef-Lg for emacs-devel@gnu.org; Tue, 24 Aug 2010 12:57:32 -0400 Original-Received: from conversion-daemon.a-mtaout20.012.net.il by a-mtaout20.012.net.il (HyperSendmail v2007.08) id <0L7O00E001QBOV00@a-mtaout20.012.net.il> for emacs-devel@gnu.org; Tue, 24 Aug 2010 19:57:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.70.215.111]) by a-mtaout20.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L7O00EP61RT9150@a-mtaout20.012.net.il>; Tue, 24 Aug 2010 19:57:30 +0300 (IDT) In-reply-to: <87occs5cg3.fsf@uwakimon.sk.tsukuba.ac.jp> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.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:129160 Archived-At: > From: "Stephen J. Turnbull" > Date: Tue, 24 Aug 2010 23:10:04 +0900 > Cc: emacs-devel@gnu.org > > In a workflow like Emacs's, where contributions go to trunk and > release manager looks for patches to cherry-pick, the "branch per fix" > approach probably makes more sense. The problem is that a new branch needs to be bootstrapped, which takes time. What I do to avoid that is keep the feature branch around even after the last feature I worked on was merged into trunk and committed upstream. Then, when I need to work on another feature in a separate branch again, I make the existing branch a mirror of the then current trunk with "bzr pull --overwrite" (after "bzr status" and careful study of its output!). Voila! I now have a fresh branch that does not need a bootstrap.