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 repository ready? Date: Sun, 22 Nov 2009 23:37:18 +0200 Message-ID: <83ljhynsvl.fsf@gnu.org> References: <87vdhfpil2.fsf@red-bean.com> <87einvxy9c.fsf@red-bean.com> <20091118230952.GB908@muc.de> <87my2jw05z.fsf@red-bean.com> <83skc9pbf7.fsf@gnu.org> <87iqd5vw5n.fsf@red-bean.com> <877htl53tc.fsf@telefonica.net> <87ws1ku7zd.fsf@red-bean.com> <87hbso4s13.fsf@telefonica.net> <83aaygoy90.fsf@gnu.org> <87vdh36d48.fsf@telefonica.net> <831vjrptha.fsf@gnu.org> <87einr63b6.fsf@telefonica.net> <83y6lzo9e7.fsf@gnu.org> <871vjr750o.fsf@uwakimon.sk.tsukuba.ac.jp> <87zl6fnnu2.fsf@notengoamigos.org> <87aayenvv1.fsf@notengoamigos.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1258925861 627 80.91.229.12 (22 Nov 2009 21:37:41 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Nov 2009 21:37:41 +0000 (UTC) Cc: ofv@wanadoo.es, stephen@xemacs.org, emacs-devel@gnu.org To: Jason Earl Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Nov 22 22:37:34 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 1NCK7g-0004fH-BR for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2009 22:37:32 +0100 Original-Received: from localhost ([127.0.0.1]:43363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCK7f-0001Xm-TZ for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2009 16:37:31 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCK7b-0001Xe-6W for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:37:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCK7W-0001X7-TG for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:37:26 -0500 Original-Received: from [199.232.76.173] (port=49845 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCK7W-0001X4-OD for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:37:22 -0500 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:37749) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NCK7W-0002Zp-5H for emacs-devel@gnu.org; Sun, 22 Nov 2009 16:37:22 -0500 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0KTJ004005C91E00@a-mtaout22.012.net.il> for emacs-devel@gnu.org; Sun, 22 Nov 2009 23:37:16 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.70.37.193]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0KTJ001LE5E33K70@a-mtaout22.012.net.il>; Sun, 22 Nov 2009 23:37:16 +0200 (IST) In-reply-to: <87aayenvv1.fsf@notengoamigos.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:117511 Archived-At: > From: Jason Earl > Cc: stephen@xemacs.org, ofv@wanadoo.es, emacs-devel@gnu.org > Date: Sun, 22 Nov 2009 13:32:50 -0700 > > So for example, you simply create a repository like so: > > bzr init-repo --no-trees emacs > > Then cd into the repository and create a mirror branch of mainline like > so: > > cd emacs > cvs branch http://bzr.savannah.gnu.org/r/emacs/trunk/ trunk > > This will create a directory that is a branch, but the branch will not > have any files in it. How do I do this if my repository is local, downloaded with the scp command discussed elsewhere in this thread? > Now let's imagine that you want to do some actual hacking in a branch > that you call dev. You would create the branch like so: > > bzr branch trunk dev > > Finally you create a workspace directory. This is the only directory > that actually has any sources in it. > > bzr co --lightweight dev workspace > > From within the workspace directory you can change branches with the > switch command. For example in the root of the workspace directory you > would type: > > bzr switch ../trunk > > to switch to the trunk. > > This setup allows you to switch between as many branches as you might > care to make without having to do a make bootstrap in each, and indeed > without having to waste space on duplicate (or nearly duplicate) copies > of the source. I miss the main issue here: what happens with files you actually change on some branch when you switch to another branch? Does bzr magically revert them to the version of that other branch, behind my back? For example, let's say I modified foo.el on some branch, and then re-built Emacs. I now have foo.elc and an Emacs binary that have it preloaded (let's say it's one of those loaded at dump time). Then I switch to another branch -- what versions of foo.el, foo.elc, and the Emacs binary will I see now?