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: Release branch plans Date: Mon, 02 Apr 2012 20:05:09 +0300 Message-ID: <83ty12hxoa.fsf@gnu.org> References: <87d37q7ld4.fsf@gnu.org> <871uo6puac.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: dough.gmane.org 1333386333 3468 80.91.229.3 (2 Apr 2012 17:05:33 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 2 Apr 2012 17:05:33 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 02 19:05:32 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1SEkh6-0004zP-9Z for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 19:05:28 +0200 Original-Received: from localhost ([::1]:56171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEkh5-00071x-Df for ged-emacs-devel@m.gmane.org; Mon, 02 Apr 2012 13:05:27 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:42150) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEkgy-00071a-IR for emacs-devel@gnu.org; Mon, 02 Apr 2012 13:05:26 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SEkgs-0000uM-DH for emacs-devel@gnu.org; Mon, 02 Apr 2012 13:05:20 -0400 Original-Received: from mtaout22.012.net.il ([80.179.55.172]:51453) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SEkgn-0000s7-6p; Mon, 02 Apr 2012 13:05:09 -0400 Original-Received: from conversion-daemon.a-mtaout22.012.net.il by a-mtaout22.012.net.il (HyperSendmail v2007.08) id <0M1V00K0037BXK00@a-mtaout22.012.net.il>; Mon, 02 Apr 2012 20:05:00 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([84.228.100.223]) by a-mtaout22.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0M1V00KP63GBN770@a-mtaout22.012.net.il>; Mon, 02 Apr 2012 20:05:00 +0300 (IDT) In-reply-to: <871uo6puac.fsf@gnu.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 (beta) X-Received-From: 80.179.55.172 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:149293 Archived-At: > From: Chong Yidong > Date: Mon, 02 Apr 2012 13:38:51 +0800 > > Now that the 24.0.95 pretest is out, we plan to cut the 24.1 branch > soon. After that is done, fixes that should go into 24.1 should be > committed into the branch, then merged into the trunk. Could we _please_ do it the other way around this time? That is, commit to the trunk and merge to the branch? Merging from the branch makes it hard to find out where some changes came from and why, because history metadata says some revisions were merged, but their code was not really brought to the target branch. If one of the branches has to sustain such damage, let it be other than the main branch, if only because the life of the release branches is much shorter; after some time no one looks at them anymore. Please?...