From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81032 Path: news.gmane.org!not-for-mail From: Steinar Bang Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Mon, 30 Jan 2012 22:24:22 +0100 Organization: Probably a good idea Message-ID: <87aa54riih.fsf@dod.no> References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> <87aa55cctr.fsf@gnus.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1327958792 7155 80.91.229.3 (30 Jan 2012 21:26:32 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 30 Jan 2012 21:26:32 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29313@lists.math.uh.edu Mon Jan 30 22:26:28 2012 Return-path: Envelope-to: ding-account@gmane.org Original-Received: from util0.math.uh.edu ([129.7.128.18]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Rryk7-0006IC-9y for ding-account@gmane.org; Mon, 30 Jan 2012 22:26:27 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.math.uh.edu) by util0.math.uh.edu with smtp (Exim 4.63) (envelope-from ) id 1RryiS-0006wc-AG; Mon, 30 Jan 2012 15:24:44 -0600 Original-Received: from mx1.math.uh.edu ([129.7.128.32]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1RryiQ-0006wS-Hx for ding@lists.math.uh.edu; Mon, 30 Jan 2012 15:24:42 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx1.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1RryiK-0003Fv-IJ for ding@lists.math.uh.edu; Mon, 30 Jan 2012 15:24:41 -0600 Original-Received: from plane.gmane.org ([80.91.229.3]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RryiH-0005uC-KE for ding@gnus.org; Mon, 30 Jan 2012 22:24:33 +0100 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1RryiH-0005Md-8Q for ding@gnus.org; Mon, 30 Jan 2012 22:24:33 +0100 Original-Received: from cm-84.208.231.161.getinternet.no ([84.208.231.161]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 30 Jan 2012 22:24:33 +0100 Original-Received: from sb by cm-84.208.231.161.getinternet.no with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Mon, 30 Jan 2012 22:24:33 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: ding@gnus.org Original-Lines: 64 Original-X-Complaints-To: usenet@dough.gmane.org X-Gmane-NNTP-Posting-Host: cm-84.208.231.161.getinternet.no Mail-Copies-To: never User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/23.3 (gnu/linux) Cancel-Lock: sha1:FNIHmvOIcxZud9hsERiEgrPnw5M= X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81032 Archived-At: >>>>> Lars Ingebrigtsen : > Well, I'll probably be having separate directories ngnus and mgnus for > the two branches, so that I can test and run them concurrently. So I > won't be pivoting branches (in the same directory) any, I think? This is not a good idea if you want to easily merge changes between the two branches. Then you should have the same layout and two separate git branches. In short: you lose the main advantage of git ("merge is *easy*") First of all: switching branches is a very low cost operation, so your main time usage when switching will be building gnus. Secondly, you can easily have two gnusen side by side without sacrificing any git-goodies: mkdir ~/git cd ~/git git clone https://git.gnus.org/gnus.git mv gnus ngnus cd ngnus git checkout -b no-gnus git push origin HEAD git checkout master git branch -D no-gnus git checkout no-gnus git branch -D master git clone https://git.gnus.org/gnus.git mv gnus mgnus This will give you two gnusen side by side, each on a different git branch, with no other clutter (that's what the "git branch -D" is about), and merging between the branches can be done by pushing and fetching from origin. The ngnus directory is on the no-gnus branch. Alternatively, if ngnus is to remain the master branch until emacs 24 is out (to ease updating beteen emacs bzr and gnus git), your can do this: mkdir ~/git cd ~/git git clone https://git.gnus.org/gnus.git mv gnus ngnus git clone https://git.gnus.org/gnus.git mv gnus mgnus cd mgnus git checkout -b mgnus git push origin HEAD git checkout master git branch -D mgnus git checkout mgnus git branch -D master Then ~/git/mgnus/ will be on the mgnus branch. With this configuration, to get the newest ngnus changes into mgnus, do this: cd ~/git/mgnus/ git fetch git merge origin/master git push origin HEAD Most of the time, merge will be a painless and conflict free operation.