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: Marking changes to be backported Date: Mon, 06 Oct 2014 18:09:54 +0300 Message-ID: <83k34dmdz1.fsf@gnu.org> References: <871tqr81jg.fsf@netris.org> <51r3yorc4p.fsf@fencepost.gnu.org> <87tx3jiknk.fsf@lifelogs.com> <87h9zj5sg6.fsf@yeeloong.lan> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1412608230 17542 80.91.229.3 (6 Oct 2014 15:10:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 6 Oct 2014 15:10:30 +0000 (UTC) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Oct 06 17:10:22 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 1Xb9vW-00057a-9L for ged-emacs-devel@m.gmane.org; Mon, 06 Oct 2014 17:10:18 +0200 Original-Received: from localhost ([::1]:52409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb9vT-0000eh-NS for ged-emacs-devel@m.gmane.org; Mon, 06 Oct 2014 11:10:15 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:59359) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb9v7-0000Y9-C0 for emacs-devel@gnu.org; Mon, 06 Oct 2014 11:09:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xb9v1-0007ZQ-Er for emacs-devel@gnu.org; Mon, 06 Oct 2014 11:09:53 -0400 Original-Received: from mtaout25.012.net.il ([80.179.55.181]:48052) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xb9v1-0007ZH-7H; Mon, 06 Oct 2014 11:09:47 -0400 Original-Received: from conversion-daemon.mtaout25.012.net.il by mtaout25.012.net.il (HyperSendmail v2007.08) id <0ND1003002YBF100@mtaout25.012.net.il>; Mon, 06 Oct 2014 18:04:57 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout25.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0ND1002LV3895C20@mtaout25.012.net.il>; Mon, 06 Oct 2014 18:04:57 +0300 (IDT) In-reply-to: X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.181 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:175017 Archived-At: > From: Glenn Morris > Date: Mon, 06 Oct 2014 02:37:30 -0400 > Cc: Emacs developers > > 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. I think using another (3rd) branch is on balance the most reliable and least error prone method. It is also much less effort to merge between branches than to cherry-pick.