From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Marking changes to be backported Date: Mon, 06 Oct 2014 02:37:30 -0400 Message-ID: References: <871tqr81jg.fsf@netris.org> <51r3yorc4p.fsf@fencepost.gnu.org> <87tx3jiknk.fsf@lifelogs.com> <87h9zj5sg6.fsf@yeeloong.lan> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1412577473 20275 80.91.229.3 (6 Oct 2014 06:37:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Oct 2014 06:37:53 +0000 (UTC) Cc: Emacs developers To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 06 08:37:46 2014 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 1Xb1vV-00078a-GE for ged-emacs-devel@m.gmane.org; Mon, 06 Oct 2014 08:37:45 +0200 Original-Received: from localhost ([::1]:50147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb1vV-0003d3-1m for ged-emacs-devel@m.gmane.org; Mon, 06 Oct 2014 02:37:45 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb1vJ-0003c5-5M for emacs-devel@gnu.org; Mon, 06 Oct 2014 02:37:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xb1vI-0003jH-Dp for emacs-devel@gnu.org; Mon, 06 Oct 2014 02:37:33 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:35226) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb1vI-0003jB-AY for emacs-devel@gnu.org; Mon, 06 Oct 2014 02:37:32 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.71) (envelope-from ) id 1Xb1vG-00012S-EV; Mon, 06 Oct 2014 02:37:30 -0400 X-Spook: embassy JFK offensive information warfare smuggle nuclear X-Ran: %Os;-:JZS5+/>mw6aox:H7-z|zr#"2%v. 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:175006 Archived-At: Stefan Monnier wrote: >> There needs to be an agreed convention to mark trunk changes that should >> be backported to the release branch at some later date. "Remember to do >> it" doesn't scale. > > If it's really needed, we can have a "emacs-24-next" branch for that. I think it will be needed if: there are to be pure bug-fix releases, and pretesting is going to continue to take months, and development is going to continue at the same time. (There are probably tons of things fixed in trunk today that should go into version 24.5, if there is one. Who's going to dig them all out and backport them? No-one.) > Then we merge emacs-24 into emacs-24-next, and then we merge > emacs-24-next into trunk. Yet more branches sounds more complicated to me (doesn't that mean you need to know when you make a change where it should go?), but I don't care about the system so long as there is one.