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: Next release from master Date: Fri, 22 Jan 2016 09:11:58 +0200 Message-ID: <83si1q6qbl.fsf@gnu.org> References: <8qegda3kfg.fsf@fencepost.gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1453446724 25808 80.91.229.3 (22 Jan 2016 07:12:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 22 Jan 2016 07:12:04 +0000 (UTC) Cc: emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 22 08:11:56 2016 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 1aMVsx-0005Ag-GR for ged-emacs-devel@m.gmane.org; Fri, 22 Jan 2016 08:11:55 +0100 Original-Received: from localhost ([::1]:51080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMVst-00016P-KI for ged-emacs-devel@m.gmane.org; Fri, 22 Jan 2016 02:11:51 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:39746) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMVsp-00016J-Kk for emacs-devel@gnu.org; Fri, 22 Jan 2016 02:11:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMVso-0007ZN-JB for emacs-devel@gnu.org; Fri, 22 Jan 2016 02:11:47 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33031) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMVsj-0007XG-VU; Fri, 22 Jan 2016 02:11:41 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4822 helo=HOME-C4E4A596F7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aMVsj-0005CR-9O; Fri, 22 Jan 2016 02:11:41 -0500 In-reply-to: (message from John Wiegley on Thu, 21 Jan 2016 17:01:50 -0800) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:198556 Archived-At: > From: John Wiegley > Date: Thu, 21 Jan 2016 17:01:50 -0800 > > I think that maybe we need three branches: one for current release work (such > as emacs-25); one towards the next release (master); and one towards the next > major release (possible name: "next"?). IMO, we shouldn't start another branch before we successfully pass the exam for "branches 101" -- being able to reliably handle 2 branches. Right now, we are not there yet, witness the latest merge problems. And if this is just to solve the problem of references to the future release in defcustom and in make-obsolete calls, then we should be better off introducing some script that would change all of them automatically when we change our decisions about where should the next release come from.