From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: Wrong commit message. What to do now? Date: Wed, 14 Jul 2010 09:29:30 +0300 Message-ID: <831vb6shit.fsf@gnu.org> References: <8739vndo36.fsf@red-bean.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: lo.gmane.org X-Trace: dough.gmane.org 1279089131 13556 80.91.229.12 (14 Jul 2010 06:32:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 14 Jul 2010 06:32:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: Karl Fogel Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Jul 14 08:32:09 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 1OYvVk-0007sU-3I for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 08:32:05 +0200 Original-Received: from localhost ([127.0.0.1]:52975 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYvVi-0004Vx-3K for ged-emacs-devel@m.gmane.org; Wed, 14 Jul 2010 02:32:02 -0400 Original-Received: from [140.186.70.92] (port=37132 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OYvVb-0004Vs-2Q for emacs-devel@gnu.org; Wed, 14 Jul 2010 02:31:56 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OYvVZ-0006Vj-M0 for emacs-devel@gnu.org; Wed, 14 Jul 2010 02:31:54 -0400 Original-Received: from mtaout23.012.net.il ([80.179.55.175]:44479) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OYvVZ-0006Vf-EO for emacs-devel@gnu.org; Wed, 14 Jul 2010 02:31:53 -0400 Original-Received: from conversion-daemon.a-mtaout23.012.net.il by a-mtaout23.012.net.il (HyperSendmail v2007.08) id <0L5J00E00BEFTK00@a-mtaout23.012.net.il> for emacs-devel@gnu.org; Wed, 14 Jul 2010 09:31:31 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([77.127.120.144]) by a-mtaout23.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0L5J00C8VBGGGZB0@a-mtaout23.012.net.il>; Wed, 14 Jul 2010 09:31:28 +0300 (IDT) In-reply-to: <8739vndo36.fsf@red-bean.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) 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:127251 Archived-At: > From: Karl Fogel > Date: Tue, 13 Jul 2010 18:16:45 -0400 > > 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. > (Aside: it feels somewhat hard to be a drive-by maintainer these days, > which is what I am. I try to be responsible about bookmark, saveplace, > and mail-hist stuff, but I can't follow project status in depth. The > fact that trunk sometimes is, and sometimes is not, the right place to > push changes makes this role a bit more difficult. Not unworkably > difficult, but it does lead to mistakes sometimes.) 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.