From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Giorgos Keramidas Newsgroups: gmane.emacs.devel Subject: Re: Making the tarball with bzr data Date: Fri, 04 Dec 2009 20:47:28 +0200 Message-ID: <87638mfuf3.fsf@kobe.laptop> References: <4B140ACF.9090808@gmx.de> <874oob955s.fsf@telefonica.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1259952475 16777 80.91.229.12 (4 Dec 2009 18:47:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Dec 2009 18:47:55 +0000 (UTC) Cc: =?iso-8859-1?Q?=D3scar?= Fuentes , emacs-devel@gnu.org To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 04 19:47:48 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 1NGdBz-0003jC-TM for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 19:47:48 +0100 Original-Received: from localhost ([127.0.0.1]:58427 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGdBz-0006PC-Od for ged-emacs-devel@m.gmane.org; Fri, 04 Dec 2009 13:47:47 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NGdBt-0006Ng-3V for emacs-devel@gnu.org; Fri, 04 Dec 2009 13:47:41 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NGdBo-0006Li-MZ for emacs-devel@gnu.org; Fri, 04 Dec 2009 13:47:40 -0500 Original-Received: from [199.232.76.173] (port=52249 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NGdBo-0006Lf-HI for emacs-devel@gnu.org; Fri, 04 Dec 2009 13:47:36 -0500 Original-Received: from poseidon.ceid.upatras.gr ([150.140.141.169]:60095) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NGdBn-0008Ee-Rl for emacs-devel@gnu.org; Fri, 04 Dec 2009 13:47:36 -0500 Original-Received: from mail.ceid.upatras.gr (unknown [10.1.0.143]) by poseidon.ceid.upatras.gr (Postfix) with ESMTP id 716D0EB4867; Fri, 4 Dec 2009 20:47:32 +0200 (EET) Original-Received: from localhost (europa.ceid.upatras.gr [127.0.0.1]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 63A95452FB; Fri, 4 Dec 2009 20:47:32 +0200 (EET) X-Virus-Scanned: amavisd-new at ceid.upatras.gr Original-Received: from mail.ceid.upatras.gr ([127.0.0.1]) by localhost (europa.ceid.upatras.gr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xDA5Qeh4iZ38; Fri, 4 Dec 2009 20:47:32 +0200 (EET) Original-Received: from kobe.laptop (ppp-94-64-250-229.home.otenet.gr [94.64.250.229]) by mail.ceid.upatras.gr (Postfix) with ESMTP id 14CBE451B2; Fri, 4 Dec 2009 20:47:32 +0200 (EET) Original-Received: from kobe.laptop (kobe.laptop [127.0.0.1]) by kobe.laptop (8.14.3/8.14.3) with ESMTP id nB4IlVci041910 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 4 Dec 2009 20:47:31 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) Original-Received: (from keramida@localhost) by kobe.laptop (8.14.3/8.14.3/Submit) id nB4IlT5b041883; Fri, 4 Dec 2009 20:47:29 +0200 (EET) (envelope-from keramida@ceid.upatras.gr) In-Reply-To: (Lennart Borgman's message of "Mon, 30 Nov 2009 22:27:00 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (berkeley-unix) 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:118265 Archived-At: On Mon, 30 Nov 2009 22:27:00 +0100, Lennart Borgman wrote: > On Mon, Nov 30, 2009 at 8:35 PM, =D3scar Fuentes wrote: >> Well, a brute force solution is to setup your personal bzr Emacs branch >> and then simply copy everything from your CVS checkout over the bzr >> branch, or in Windows parlance, copy the contents of the folder >> lennarts_CVS_checkout over lennarts_bzr_branch, overwriting >> everythin. You can remove the CVS directories on the bzr branch, as they >> would be useless once the switch at Savannah is complete. > > I am grateful for the explanations you and others have given for this. > I am just surprised that I have to copy the files. It certainly makes > the process slower in several ways. I have to do more. And there will > be more network traffic etc. Hi Lennard, You will have to copy a bzr-based trunk, but this is something you will only have to do the first time. The cost of subsequent merges with the Emacs upstream is significantly lower than the first copy. Once you go through the initial 'pain' of having to branch from the Emacs trunk, there are a few things to gain too: * You get to merge with the Emacs upstream branch as many times as you want. All the merges are shown explicitly in the history of your local branch, so it is easier to reason about questions like "When was the last time my merge worked fine?" or to move between two different merge points, even if one of them is arbitrarily old. * Your w32 branch will be visible to others too, including its full merge history with the Emacs upstream. You can publish your w32 branch either on Launchpad or on your own web server, and other people can look at the changes, submit their own extra changes, and so on. * Once you commit your local changes to a bzr branch, it is much safer to experiment with *more* changes, since the already committed patches will not go away even if you wipe all the files in the working copy. If you accidentally modify a file and break your local w32 copy in some annoying way, you can just check-out a fresh copy from bzr.