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: Locks on the Bzr repository Date: Tue, 24 Aug 2010 23:27:57 +0200 Message-ID: <87lj7vg0pu.fsf@telefonica.net> References: <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> <837hjgndzb.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1282685300 7402 80.91.229.12 (24 Aug 2010 21:28:20 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 24 Aug 2010 21:28:20 +0000 (UTC) Cc: Eli Zaretskii To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 24 23:28:18 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 1Oo12X-0005vc-DX for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 23:28:17 +0200 Original-Received: from localhost ([127.0.0.1]:36580 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oo12W-0006zE-Oo for ged-emacs-devel@m.gmane.org; Tue, 24 Aug 2010 17:28:16 -0400 Original-Received: from [140.186.70.92] (port=46579 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Oo12Q-0006z9-JP for emacs-devel@gnu.org; Tue, 24 Aug 2010 17:28:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Oo12P-0004JD-Kj for emacs-devel@gnu.org; Tue, 24 Aug 2010 17:28:10 -0400 Original-Received: from lo.gmane.org ([80.91.229.12]:57706) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Oo12P-0004Iy-3P for emacs-devel@gnu.org; Tue, 24 Aug 2010 17:28:09 -0400 Original-Received: from list by lo.gmane.org with local (Exim 4.69) (envelope-from ) id 1Oo12M-0005l1-Hy for emacs-devel@gnu.org; Tue, 24 Aug 2010 23:28:06 +0200 Original-Received: from 83.38.73.98 ([83.38.73.98]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 24 Aug 2010 23:28:06 +0200 Original-Received: from ofv by 83.38.73.98 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Tue, 24 Aug 2010 23:28:06 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 31 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: 83.38.73.98 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) Cancel-Lock: sha1:CcIALTwhuz5raQlmb4JYnl9mJbo= X-detected-operating-system: by eggs.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:129174 Archived-At: Eli Zaretskii writes: > 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. For this, local, --no-tree branches combined with `bzr switch' may be more convenient. That essentially emulates git's colocated branches: # create the branch where you work: bzr branch trunk work cd work, bootstrap cd .. # create a bugfix branch bzr branch --no-tree trunk bugfix#3844 cd work bzr commit # now you work on another bugfix: cd .. && bzr branch --no-tree bugfix#3871 && cd work bzr switch bugfix3871 bzr commit # go back to work on the previous bugfix: bzr switch bugfix3844 ....