From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81034 Path: news.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.gnus.general Subject: Re: New branch for No Gnus Date: Mon, 30 Jan 2012 23:05:05 +0100 Message-ID: <87bopkc0dq.fsf@gnus.org> References: <87bopnvezm.fsf@gnus.org> <87k44bh84h.fsf@dod.no> <87aa55cctr.fsf@gnus.org> <87aa54riih.fsf@dod.no> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1327961171 23622 80.91.229.3 (30 Jan 2012 22:06:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 30 Jan 2012 22:06:11 +0000 (UTC) To: ding@gnus.org Original-X-From: ding-owner+M29315@lists.math.uh.edu Mon Jan 30 23:06:08 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 1RrzMV-0007Ph-IK for ding-account@gmane.org; Mon, 30 Jan 2012 23:06:07 +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 1RrzLl-0007LZ-PU; Mon, 30 Jan 2012 16:05:21 -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 1RrzLk-0007LR-9P for ding@lists.math.uh.edu; Mon, 30 Jan 2012 16:05:20 -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 1RrzLg-0003Pl-4P for ding@lists.math.uh.edu; Mon, 30 Jan 2012 16:05:20 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1RrzLe-0006sx-M3 for ding@gnus.org; Mon, 30 Jan 2012 23:05:14 +0100 Original-Received: from 93-41-188-50.ip82.fastwebnet.it ([93.41.188.50] helo=rusty) by hermes.netfonds.no with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.72) (envelope-from ) id 1RrzLX-0001am-4Z for ding@gnus.org; Mon, 30 Jan 2012 23:05:07 +0100 In-Reply-To: <87aa54riih.fsf@dod.no> (Steinar Bang's message of "Mon, 30 Jan 2012 22:24:22 +0100") User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1RrzLX-0001am-4Z MailScanner-NULL-Check: 1328565907.49041@zwRcvC7z9zivKgvUfXdO5g X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81034 Archived-At: Steinar Bang writes: > First of all: switching branches is a very low cost operation, so your > main time usage when switching will be building gnus. Yes, and that's not an option. I will usually be using Ma Gnus, but testing bug fixes with No Gnus, and a work flow that requires me to... do something... to switch between the two is just out of the question. > Secondly, you can easily have two gnusen side by side without > sacrificing any git-goodies: Yes, that's what I was meaning to say. :-) Two directories that point to different branches. > 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. Thanks. I think all merging will be from no-gnus to ma-gnus, and not the other way around. Unless I mess stuff up. :-) > Most of the time, merge will be a painless and conflict free operation. Except for the ChangeLog, but I've installed git-merge-changelog now, and hope that that'll fix stuff. -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome