From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?windows-1252?Q?=D3scar_Fuentes?= Newsgroups: gmane.emacs.devel Subject: Re: Switching to bzr: what Emacs developers should know? Date: Sun, 09 Aug 2009 04:24:40 +0200 Message-ID: <87tz0h67x3.fsf@telefonica.net> References: <874osi6zpe.fsf@bzg.ath.cx> <28c656e20908081151h55a4b566v4cfc7c49c5ca2a37@mail.gmail.com> <8763cxluoq.fsf@bzg.ath.cx> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1249784727 12712 80.91.229.12 (9 Aug 2009 02:25:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 9 Aug 2009 02:25:27 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Aug 09 04:25:20 2009 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 1MZy64-0007tF-Bs for ged-emacs-devel@m.gmane.org; Sun, 09 Aug 2009 04:25:20 +0200 Original-Received: from localhost ([127.0.0.1]:46413 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZy63-0000Mt-KW for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2009 22:25:19 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MZy5y-0000Le-S9 for emacs-devel@gnu.org; Sat, 08 Aug 2009 22:25:14 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MZy5t-0000KM-5F for emacs-devel@gnu.org; Sat, 08 Aug 2009 22:25:13 -0400 Original-Received: from [199.232.76.173] (port=51624 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZy5s-0000KJ-Ui for emacs-devel@gnu.org; Sat, 08 Aug 2009 22:25:09 -0400 Original-Received: from main.gmane.org ([80.91.229.2]:48555 helo=ciao.gmane.org) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MZy5r-0004wh-Sl for emacs-devel@gnu.org; Sat, 08 Aug 2009 22:25:08 -0400 Original-Received: from list by ciao.gmane.org with local (Exim 4.43) id 1MZy5e-0003ps-Fz for emacs-devel@gnu.org; Sun, 09 Aug 2009 02:24:54 +0000 Original-Received: from 211.red-83-36-171.dynamicip.rima-tde.net ([83.36.171.211]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 09 Aug 2009 02:24:54 +0000 Original-Received: from ofv by 211.red-83-36-171.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sun, 09 Aug 2009 02:24:54 +0000 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 76 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 211.red-83-36-171.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:v+LV96gp/2ECF3xZjDWNAPTMxH4= X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4) 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:113835 Archived-At: Bastien writes: >> Presumably, you've seen this, yes?: >> http://www.emacswiki.org/emacs/BzrForEmacsDevs > >> First, initialize a repository in which to store all your branches: >> >> bzr init-repo --2a emacs/ > > (I hope we won't need this "--2a" option anytime soon.) Why? The 2a format speeds up some operations and will be the default format for bzr 2.0 (to be released some weeks from now). >> Create a branch that will just be a mirror of the mainline. You’ll >> never make any changes to this branch; its job is just to reflect the >> upstream master: >> >> cd emacs/ >> bzr branch http://bzr.savannah.gnu.org/sources/emacs/trunk/ trunk/ > > Is this "trunk" branch necessary, or just a convenience? A big convenience. > Why isn't the default branch enough for the trunk-tasks described > in this page? If you work with feature branches, having a local mirror saves a lot of network traffic when creating the branches and allows branching while off-line. >> And after refreshing the mirror, you’ll want to get those changes into >> your task branch, by merging them: >> >> cd SOME-TASKNAME/ >> bzr merge >> bzr commit -m "Merge from mainline." > > Is this merge happening between the local branch and the trunk or the > local branch and the default branch? By default, the merge will happen between the branch you are working on (what you call "local branch") and your mirror branch. >> If you’re one of the Emacs maintainers, then you can just push it >> directly to the upstream master: >> >> bzr push %%bzr+ssh://bzr.savannah.gnu.org/sources/emacs/trunk/%% > > Any chance to reduce this to "bzr push"? bzr will remember the location you used for push, pull, etc and will use it as the default for the next same operation. > IIUC this sequence will do: > > ,---- > | cd SOME-TASK/ > | echo "public_branch = http://bzr.savannah.gnu.org/sources/emacs/trunk" >> .bzr/branch/config > | bzr bind http://bzr.savannah.gnu.org/sources/emacs/trunk/ > | cd .. > `---- > > Then "bzr push" will push to the public_branch location. Am I right? Yes, but this is no different from what CVS does: every commit goes straight away to the central repo. BTW, I wouldn't recommend the echo trick quoted abobe. If in doubt, use the --remeber option to store the location. -- Óscar