From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Jason Earl Newsgroups: gmane.emacs.devel Subject: Re: Making the tarball with bzr data Date: Mon, 30 Nov 2009 11:52:27 -0700 Message-ID: <87k4x7976c.fsf@notengoamigos.org> References: <87iqd5vw5n.fsf@red-bean.com> <87vdh29lfo.fsf@red-bean.com> <83k4xhoo0n.fsf@gnu.org> <87my2dhlko.fsf@telefonica.net> <87r5rpsnfw.fsf@uwakimon.sk.tsukuba.ac.jp> <873a44hbpn.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 1259608341 31990 80.91.229.12 (30 Nov 2009 19:12:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 30 Nov 2009 19:12:21 +0000 (UTC) Cc: =?utf-8?Q?=C3=93scar?= Fuentes , Stefan Monnier , emacs-devel@gnu.org To: Lennart Borgman Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Nov 30 20:12: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 1NFBfP-0006Oa-3x for ged-emacs-devel@m.gmane.org; Mon, 30 Nov 2009 20:12:11 +0100 Original-Received: from localhost ([127.0.0.1]:33532 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFBfO-0007TI-M8 for ged-emacs-devel@m.gmane.org; Mon, 30 Nov 2009 14:12:10 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NFBMv-0007K3-1z for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:53:05 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NFBMo-00078L-QX for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:53:03 -0500 Original-Received: from [199.232.76.173] (port=59407 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NFBMn-000789-2q for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:52:57 -0500 Original-Received: from mailout11.yourhostingaccount.com ([65.254.253.93]:38114) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1NFBMm-0005dR-Tu for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:52:57 -0500 Original-Received: from mailscan02.yourhostingaccount.com ([10.1.15.2] helo=mailscan02.yourhostingaccount.com) by mailout11.yourhostingaccount.com with esmtp (Exim) id 1NFBMe-0007hi-Lj for emacs-devel@gnu.org; Mon, 30 Nov 2009 13:52:48 -0500 Original-Received: from impout02.yourhostingaccount.com ([10.1.55.2] helo=impout02.yourhostingaccount.com) by mailscan02.yourhostingaccount.com with esmtp (Exim) id 1NFBMe-0002u1-K5; Mon, 30 Nov 2009 13:52:48 -0500 Original-Received: from authsmtp10.yourhostingaccount.com ([10.1.18.10]) by impout02.yourhostingaccount.com with NO UCE id BWsc1d0020D2B7u0000000; Mon, 30 Nov 2009 13:52:36 -0500 X-EN-OrigOutIP: 10.1.18.10 X-EN-IMPSID: BWsc1d0020D2B7u0000000 Original-Received: from [67.214.244.122] (helo=jearl-netbook) by authsmtp10.yourhostingaccount.com with esmtpa (Exim) id 1NFBMR-0002d8-Ts; Mon, 30 Nov 2009 13:52:36 -0500 Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwCAAAAAByaaZbAAAABGdBTUEAALGPC/xhBQAAAAFz UkdCAK7OHOkAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAAlw SFlzAAASmwAAEpsB4JJZDAAAAAl2cEFnAAAAMAAAADAAzu6MVwAAAaFJREFUSMe1VtuxxSAIzIz9 2Iyl2Aj1bBX0k5+LrwjGjJyPy2ROwtGNBJbVCwwwy1UNoOL3f+SBxkj15Lr4NsboN24DWMZxYQNA TjGmjC1gswJiqBbpDeANYMwXBFyAFB5L7ADMBcoSDgAFBSDHR2tA8ABMSB4AawB76pAnILsKx2lm 1VfpgUi3kxrySylRHdmQj40Jva2/jl8EY3Twv/phhsC9nIQR0hnAOUptYsL3RxvAk+YIH2AWsvTH GYBgKn8GaPYm5jNANaCQ8WfAzyH9x0crFfGl9X4QVdg8gEqN2KjBHi6V/iBq6iyAxTqd+Yvupwai VwM9LZkxQ6otihmS6H+mHlK5URwi0UQgWxHoxS5JagBSed7IzJRCallS2pg2QsamcGUFNSHgLZUv augJIUualv1Bv6+yVat1oeMq92s/mBBWQJH7dQX7CnpvWWs/4CazpHlB2RR1BFSzNGdIaTbbLil8 U76BKKU0GztapXP3C78bNYQ6MTQybY8OkIaITf9HPzyHkXE4YXs4mf5VDz+jAepj3RTQ3Ubv0SPy 9AcCrfKh0TBgvgAAACV0RVh0Y3JlYXRlLWRhdGUAMjAwOS0wOC0yN1QxNjoxMTozMy0wNjowMFPN ssMAAAAldEVYdG1vZGlmeS1kYXRlADIwMDktMDgtMjdUMTY6MTE6MzMtMDY6MDAMfMT3AAAAAElF TkSuQmCC In-Reply-To: (Lennart Borgman's message of "Mon, 30 Nov 2009 17:34:32 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1 (gnu/linux) X-EN-UserInfo: f8a5a3c49e1c4664ba81facb1022c4a9:67ddfe7aeaee6d1ea5b788d961d42633 X-EN-AuthUser: jearl@notengoamigos.org X-EN-OrigIP: 67.214.244.122 X-EN-OrigHost: unknown X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. 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:117983 Archived-At: Lennart Borgman writes: > On Tue, Nov 24, 2009 at 3:56 AM, =C3=93scar Fuentes wrot= e: >> Stefan Monnier writes: >> >>> But the hard part is to integrate those 3 starting points with the >>> "wget+untar" approach. >> >> There is a very simple & safe method for creating a tarball that just >> requires untarring at the other end. >> >> First, create a bound branch of `trunk' on a shared repository [1]: >> >> bzr init-repo emacs-repo >> bzr checkout http://bzr.savannah.gnu.org/r/emacs/trunk >> >> Now, the process of creating the tarball is: >> >> cd emacs-repo/trunk >> bzr update >> cd ../.. >> tar the emacs-repo directory >> >> The user just needs to download and untar to get a shared repository >> containing `trunk' with read-only access to the GNU repository. A >> `bzr update' is enough to get the latest changes and thus have a >> mirror of the branch on the GNU repository. >> >> If the user is an emacs hacker with write access rights, he does: >> >> cd emacs-repo/trunk >> bzr unbind >> bzr bind sftp://bzr.savannah.gnu.org/r/emacs/trunk >> >> And he is ready to start committing. [2] >> >> If the user needs access to other branches, obtaining them with >> bazaar just requires a few minutes, as only those revisions which are >> not common with `trunk' will be downloaded. >> >> If the user prefers other workflows, he has everything he needs, as >> he can create branches from the mirror bound branch or unbind the >> mirror branch, so this method is not restricted to the "bound work >> branch" workflow. > > > If I already have all the Emacs files locally (possibly with some > changes) how do I do to make this a bazaar thing? (This must be the > most common situation, or?) If you are primarily interested in tracking your own changes, then simply doing a: bzr init in the root of the directory will get you started. However, this makes a brand new branch that is completely unrelated to the mainline Emacs branch. Merging your branch with the main Emacs branch would be far more difficult than it needs to be, and so would getting new improvements from the mainline Emacs branch. So, that's probably not what you want to do. What you probably want to do is to migrate the changes you have made to Emacs into a new branch that can be used both to track changes made upstream to Emacs and (hopefully) to allow you to develop new changes that can be applied upstream. The way to do that is to follow the instructions at: http://www.emacswiki.org/emacs/BzrForEmacsDevs to create a repository along with a "trunk" branch that tracks Emacs' mainline development. Then create a second branch (called, for example, lennart). Finally, use a tool like rsync to copy your changes into the lennart branch. You can then do: bzr status to see what files have changed and: bzr diff to generate a diff of what has changed. Once you are satisfied that your changes are the working tree for your shiny new branch. bzr commit -m "Importing my changes into a new bzr branch" will commit your changes to your local branch. Hopefully this was helpful. Jason