From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Lennart Borgman Newsgroups: gmane.emacs.devel Subject: Re: bzr repository ready? Date: Fri, 20 Nov 2009 22:20:05 +0100 Message-ID: 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> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1258752067 6978 80.91.229.12 (20 Nov 2009 21:21:07 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Nov 2009 21:21:07 +0000 (UTC) Cc: emacs-devel@gnu.org To: =?UTF-8?Q?=C3=93scar_Fuentes?= Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 20 22:21:00 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 1NBauZ-0005gT-0u for ged-emacs-devel@m.gmane.org; Fri, 20 Nov 2009 22:20:59 +0100 Original-Received: from localhost ([127.0.0.1]:40819 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NBauY-0003Tm-Cu for ged-emacs-devel@m.gmane.org; Fri, 20 Nov 2009 16:20:58 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NBauA-0003Hl-Ao for emacs-devel@gnu.org; Fri, 20 Nov 2009 16:20:34 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NBau5-0003Fb-P5 for emacs-devel@gnu.org; Fri, 20 Nov 2009 16:20:33 -0500 Original-Received: from [199.232.76.173] (port=37961 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NBau5-0003FT-DZ for emacs-devel@gnu.org; Fri, 20 Nov 2009 16:20:29 -0500 Original-Received: from mail-yx0-f177.google.com ([209.85.210.177]:65292) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NBau5-0002bj-1o for emacs-devel@gnu.org; Fri, 20 Nov 2009 16:20:29 -0500 Original-Received: by yxe7 with SMTP id 7so3521616yxe.25 for ; Fri, 20 Nov 2009 13:20:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type :content-transfer-encoding; bh=aWp8VxYMaE8MoBtWZt3CezqLHPsfRDmAsn6oM/Fh6Zw=; b=tL450qcPILJKFasgGO8nNfKN54hQseK/niWlywyOxfFVhzernt7a9/24pQQx+GwZSA MK8IIZtQY9OhOpPMOkUEVR852GKdr4BE8z52oKdKZODr98q9tUghRv8apXpH4GcaZ8tR T3rvZaW4hwuurPDZk+plSEykVfgLI5F/zoJ1o= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; b=OStfOFmUCc3subD4azZqELXwKrd+9ivOqz4OCf9sc4qsQms1xQ+YJA4FeH78eAqIoG nRKO8Z9VvyRLZxq6N/k/HnArk7LDwA5Qxhqa4AGuEAbobBAWNW2X6SKjtMI6x+S+Zic4 5ekyG7CRA9EucLd1gPeKE4A7P+sr14HH2VR9s= Original-Received: by 10.101.155.38 with SMTP id h38mr2803928ano.146.1258752025798; Fri, 20 Nov 2009 13:20:25 -0800 (PST) In-Reply-To: <877htl53tc.fsf@telefonica.net> X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) 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:117379 Archived-At: 2009/11/20 =C3=93scar Fuentes : > 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). Yes. I becames quite a bit easier to communicate when you give me the terms to use like here. > 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. Ok. > 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). Hm. I can see there are useful things there, but I need a bit hand holding. Currently I have two checkouts from Emacs CVS: * One which I just checkout and compile. I upload it if someone wants it, but I do not use it - except for bug checking and reporting. * The second checkout is where I have all my patches. (I have thrown away quite a lot of them, it takes too much time to have them and if they never makes it into Emacs I can just as well put them in the garbage can. That saves me time at least. There are however some small patches that are essential to get Emacs working descently.) I never merge those changes myself into the upstream Emacs becaus I have felt to unsure about the operations. That is a pitty of course since it causes other people trouble, but ... >From this second checkout I build my patched version of Emacs which I myself and many others use. How should I set things up when using bazaar? I would really like to somehow have my patches also in a repository an Launchpad. That would make many things more simple. > 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 ... sane or insane ... it is shorter ... maybe not so much insanity then ..= . ;-) But I would be glad for an example with pictures for a situation like the one I have here. > -- > =C3=93scar > > > >