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: bzr repository ready? Date: Fri, 20 Nov 2009 21:39:11 +0100 Message-ID: <877htl53tc.fsf@telefonica.net> References: <87639fr3w7.fsf@red-bean.com> <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> 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 1258749680 31828 80.91.229.12 (20 Nov 2009 20:41:20 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Nov 2009 20:41:20 +0000 (UTC) Cc: =?windows-1252?Q?=D3scar_Fuentes?= To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 20 21:41:13 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 1NBaI3-0005vm-U2 for ged-emacs-devel@m.gmane.org; Fri, 20 Nov 2009 21:41:12 +0100 Original-Received: from localhost ([127.0.0.1]:48584 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NBaI3-0007eC-Cl for ged-emacs-devel@m.gmane.org; Fri, 20 Nov 2009 15:41:11 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NBaHw-0007bK-GU for emacs-devel@gnu.org; Fri, 20 Nov 2009 15:41:04 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NBaHr-0007U6-BM for emacs-devel@gnu.org; Fri, 20 Nov 2009 15:41:03 -0500 Original-Received: from [199.232.76.173] (port=34312 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NBaHr-0007Tu-3b for emacs-devel@gnu.org; Fri, 20 Nov 2009 15:40:59 -0500 Original-Received: from lo.gmane.org ([80.91.229.12]:57189) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NBaHq-00041L-Lf for emacs-devel@gnu.org; Fri, 20 Nov 2009 15:40:58 -0500 Original-Received: from list by lo.gmane.org with local (Exim 4.50) id 1NBaHn-0005p5-Pp for emacs-devel@gnu.org; Fri, 20 Nov 2009 21:40:55 +0100 Original-Received: from 4.red-88-24-230.staticip.rima-tde.net ([88.24.230.4]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Nov 2009 21:40:55 +0100 Original-Received: from ofv by 4.red-88-24-230.staticip.rima-tde.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 20 Nov 2009 21:40:55 +0100 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 49 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 4.red-88-24-230.staticip.rima-tde.net User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) Cancel-Lock: sha1:lr5U+LsUg6D2XxanLAlXYyUTbms= 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:117377 Archived-At: Lennart Borgman writes: > One thing I do not understand is these "lightweight" branches. Sounds > good, but where are the files? > > I mean if I create a branch and it shares storage with the mirror of > the mainline, does it still have all the files there that I need to > compile and build Emacs? Is it just the history and version files that > are shared, or? It is essential to distinguish the working copy (aka working tree, the files you work with) from the VC data (history, metadata, etc). A lightweight *checkout* uses the history data that resides on the parent branch, but you still have your working copy. It is very similar to CVS, where you have your files but for viewing the log, diffing, etc the repository is used. A lightweight checkout is simply a way of saving disk space and get a working copy quickly, as the history data is not copied from the parent branch to the new branch. On bzr parlance there are no lightweight branches. There are stacked branches though, which also use the VC data of the parent branch. The difference among a checkout and a branch is that when you commit on a checkout your changes go to the parent branch too, but when you commit on a branch your changes remain there, and you need another operation (push) to send them to the parent branch (or to any other branch). A non lightweight checkout supports committing changes without sending them to the parent branch, using a command line option. A lightweight checkout does not support this because it lacks the local VC data. Actually, a non lightweight checkout is what Bazaar calls a bound branch. You can unbind a non-ligthweigth checkout anytimme for converting it to a regular branch and you can bind a branch to some other branch to convert it to a checkout of that branch. Bazaar supports quite a few models and can be confusing for those who only know the centralized paradigm. IMHO the documentation should recommend a model for beginners and give very detailed instructions for it (maybe already does, I didn't read it). For a sane version of the above explanation, execute this on your shell: bzr help checkouts -- Óscar