From mboxrd@z Thu Jan 1 00:00:00 1970 X-Msuck: nntp://news.gmane.io/gmane.emacs.gnus.general/81027 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 18:02:27 +0100 Message-ID: <87obtlcee4.fsf@gnus.org> References: <87bopnvezm.fsf@gnus.org> <877h0bpqw4.fsf@FreeBSD.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1327942969 14122 80.91.229.3 (30 Jan 2012 17:02:49 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 30 Jan 2012 17:02:49 +0000 (UTC) Cc: ding@gnus.org To: Raphael Kubo da Costa Original-X-From: ding-owner+M29308@lists.math.uh.edu Mon Jan 30 18:02:48 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 1Rrucy-00032v-5D for ding-account@gmane.org; Mon, 30 Jan 2012 18:02:48 +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 1Rrucw-0005hZ-04; Mon, 30 Jan 2012 11:02:46 -0600 Original-Received: from mx2.math.uh.edu ([129.7.128.33]) by util0.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.63) (envelope-from ) id 1Rrucu-0005hO-Ru for ding@lists.math.uh.edu; Mon, 30 Jan 2012 11:02:44 -0600 Original-Received: from quimby.gnus.org ([80.91.231.51]) by mx2.math.uh.edu with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) (envelope-from ) id 1Rruct-0003uX-Up for ding@lists.math.uh.edu; Mon, 30 Jan 2012 11:02:44 -0600 Original-Received: from hermes.netfonds.no ([80.91.224.195]) by quimby.gnus.org with esmtp (Exim 4.72) (envelope-from ) id 1Rrucs-00081l-Hs for ding@gnus.org; Mon, 30 Jan 2012 18:02:42 +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 1Rrucf-0004n4-Bs; Mon, 30 Jan 2012 18:02:29 +0100 In-Reply-To: <877h0bpqw4.fsf@FreeBSD.org> (Raphael Kubo da Costa's message of "Sat, 28 Jan 2012 17:29:31 -0200") User-Agent: Gnus/5.110018 (No Gnus v0.18) Emacs/24.0.92 (gnu/linux) X-MailScanner-ID: 1Rrucf-0004n4-Bs MailScanner-NULL-Check: 1328547750.1372@Vrb5v/oKMvzwXLOr6gELKg X-Spam-Status: No X-Spam-Score: -1.9 (-) List-ID: Precedence: bulk Xref: news.gmane.org gmane.emacs.gnus.general:81027 Archived-At: Raphael Kubo da Costa writes: > Shamefully, I have not watched all the recent threads here, so I'm not > sure what the purpose of keeping master from a "stable" branch is. Would > it be possible to clarify that to a newcomer (ie. only the stable branch > is merged back into Emacs etc)? Yes. Emacs 24 is in a feature freeze. > $ git checkout -b no-gnus-with-unique-version-identifier master > $ # edit files, commit etc > $ git push origin no-gnus-with-unique-version-identifier > > And then later: > $ git checkout master > $ git merge [--log] no-gnus-with-unique-version-identifier > $ git push origin master > > Merging the ChangeLog entries can be problematic, though. Right. I think I saw something about a ChangeLog plugin for git, though... -- (domestic pets only, the antidote for overdose, milk.) http://lars.ingebrigtsen.no * Sent from my Rome