From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Karl Fogel Newsgroups: gmane.emacs.devel Subject: Re: Wrong commit message. What to do now? Date: Wed, 14 Jul 2010 11:29:15 -0400 Message-ID: <87pqyqaxpw.fsf@kslab.red-bean.com> References: <8739vndo36.fsf@red-bean.com> <831vb6shit.fsf@gnu.org> Reply-To: Karl Fogel NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1279121369 1419 80.91.229.12 (14 Jul 2010 15:29:29 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 14 Jul 2010 15:29:29 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 14 17:29:28 2010 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.69) (envelope-from ) id 1OZ3tm-0004uq-MB for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 17:29:27 +0200 Original-Received: from localhost ([127.0.0.1]:37710 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ3tl-0001Cb-NN for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 11:29:25 -0400 Original-Received: from [140.186.70.92] (port=54398 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OZ3tb-00018u-C1 for emacs-devel@gnu.org; Wed, 14 Jul 2010 11:29:19 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OZ3tZ-0001et-OK for emacs-devel@gnu.org; Wed, 14 Jul 2010 11:29:15 -0400 Original-Received: from osh-net-219-98.onshore.net ([66.146.219.98]:58117 helo=sanpietro.red-bean.com) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OZ3tZ-0001em-IT; Wed, 14 Jul 2010 11:29:13 -0400 Original-Received: from localhost ([127.0.0.1]:38445 helo=kslab.red-bean.com ident=kfogel) by sanpietro.red-bean.com with esmtp (Exim 4.72) (envelope-from ) id 1OZ3tY-0004VA-QA; Wed, 14 Jul 2010 10:29:12 -0500 In-Reply-To: <831vb6shit.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 14 Jul 2010 09:29:30 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.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:127291 Archived-At: Eli Zaretskii writes: >> Also, I had forgotten: are we not supposed to be committing to trunk >> right now? > >Why not? There's no branch or feature freeze anywhere in sight. That's what I don't know how to tell -- where do I look to see what's "in sight"? In my previous mail, I listed the places I looked. But in the past, when there *has* been a feature freeze, I'm pretty sure those places also did not say anything special. >If you commit a safe bugfix for a problem that exists in Emacs 23.2, >consider committing to the emacs-23 branch, not to the trunk; it will >get merged with the trunk later. And there's a request from Stefan >and Yidong to commit either to the trunk or to emacs-23, but not to >both. This is to make the merges from emacs-23 to the trunk a bit >less painful. That's all, there are no other rules. How's that too >complicated, I don't see. Oh, I wasn't saying that's too complicated. What I was saying is that I didn't know how to *find* those rules (and therefore, before this moment, didn't know them). Now that you've stated them explicitly, I can refer to your mail. I'd been looking for them in places more permanent than the mail archive and not finding them, that's all. And for those of us who have only a little room left in our heads, we can just remember "push only to trunk, always" if nothing else :-). Thanks for laying it out clearly. -Karl