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: bzr repository ready? Date: Mon, 23 Nov 2009 00:15:08 +0100 Message-ID: <87d43a40eb.fsf@telefonica.net> References: <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> <83ljhynsvl.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Trace: ger.gmane.org 1258931862 18831 80.91.229.12 (22 Nov 2009 23:17:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 22 Nov 2009 23:17:42 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 23 00:17:35 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 1NCLgU-00079x-CE for ged-emacs-devel@m.gmane.org; Mon, 23 Nov 2009 00:17:34 +0100 Original-Received: from localhost ([127.0.0.1]:45455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCLgT-0001R0-OE for ged-emacs-devel@m.gmane.org; Sun, 22 Nov 2009 18:17:33 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NCLgN-0001Nx-DN for emacs-devel@gnu.org; Sun, 22 Nov 2009 18:17:27 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NCLgJ-0001Jo-Mz for emacs-devel@gnu.org; Sun, 22 Nov 2009 18:17:27 -0500 Original-Received: from [199.232.76.173] (port=56700 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NCLgJ-0001Jh-JW for emacs-devel@gnu.org; Sun, 22 Nov 2009 18:17:23 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:42525) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NCLgJ-0007cS-2i for emacs-devel@gnu.org; Sun, 22 Nov 2009 18:17:23 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NCLgH-00074f-BM for emacs-devel@gnu.org; Mon, 23 Nov 2009 00:17:21 +0100 Original-Received: from 83.red-83-40-117.dynamicip.rima-tde.net ([83.40.117.83]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 Nov 2009 00:17:21 +0100 Original-Received: from ofv by 83.red-83-40-117.dynamicip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 23 Nov 2009 00:17:21 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 75 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 83.red-83-40-117.dynamicip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:XdBwBZBvku/194viF9G6D07C1j4= X-detected-operating-system: by monty-python.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:117515 Archived-At: Eli Zaretskii writes: >> 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? In that case you already have the branches, but the files are inside the metadata. So cd to a branch (`trunk', for instance) and do bzr checkout `checkout' is an overloaded command in bzr. Here it means "populate this branch with the corresponding working tree (i.e. the files you edit)". But please read my previous response to Stephan where I say some things about trees/no-tress and `cp' issue. >> 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? Not behind your back, because that was precisely what you asked for with `bzr switch'. > 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? foo.el will be the one on the branch you switched to. foo.elc and the emacs binary will be the same as before. bzr knows nothing about non-versioned files, and even less about products such as .elc files and executables, so you need to do a `make'. If the switch changed some file that is a dependency of the emacs executable and the makefiles work as they should, it will be rebuilt, which is the case here because file.el was modified. -- Óscar