From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: John Wiegley Newsgroups: gmane.emacs.devel Subject: Future release schedules (was: make change-history on non-master branches) Date: Fri, 20 Nov 2015 08:38:35 -0800 Message-ID: References: <831tbqc4pc.fsf@gnu.org> <9ta8qb5gcc.fsf@fencepost.gnu.org> <83egfn9nmp.fsf@gnu.org> <83bnar9mcd.fsf@gnu.org> <83r3jm7zw1.fsf@gnu.org> <87lh9tkby8.fsf@isaac.fritz.box> <83wptd7mif.fsf@gnu.org> <83mvu96qjk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1448037630 708 80.91.229.3 (20 Nov 2015 16:40:30 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 20 Nov 2015 16:40:30 +0000 (UTC) Cc: rgm@gnu.org, eggert@cs.ucla.edu, deng@randomsample.de, Juanma Barranquero , emacs-devel@gnu.org, schwab@suse.de To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 20 17:40:25 2015 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 1ZzojQ-0006rZ-5o for ged-emacs-devel@m.gmane.org; Fri, 20 Nov 2015 17:40:16 +0100 Original-Received: from localhost ([::1]:48447 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzojP-0006nr-8k for ged-emacs-devel@m.gmane.org; Fri, 20 Nov 2015 11:40:15 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34337) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZzojB-0006nZ-Se for emacs-devel@gnu.org; Fri, 20 Nov 2015 11:40:02 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZzojA-0004eb-Ls for emacs-devel@gnu.org; Fri, 20 Nov 2015 11:40:01 -0500 Original-Received: from mail-pa0-x22e.google.com ([2607:f8b0:400e:c03::22e]:33553) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Zzoj6-0004do-1O; Fri, 20 Nov 2015 11:39:56 -0500 Original-Received: by pabfh17 with SMTP id fh17so124850428pab.0; Fri, 20 Nov 2015 08:39:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:in-reply-to:date:message-id:references :user-agent:mail-followup-to:mime-version:content-type; bh=yHcerVz/eOj8WgUYYI5xUzWraG5SYBYZFqUTZfb1C7o=; b=buoV4ynP4ZYx1NCaUstubodI1q0ktyHKUMHS0ZRSTVhDVFkbYzihapsOgRk+W3idMb n1LVbnysUgjfAYMvOh0G4FVrAgBXN0nrDHNVjA2eCJAC7cttb/9NfQKlsSp9ZlzsDBId b6gpAsb5mbf7BcJfjCQg1IDSyxEo37qE+Y7gzWO9QqcsHx2izSLLvcLzReA2JNyF25II Q59Ffp4DZCuydY5xvigATGRVwz5gOiCGtRf6B81Qq8zwD2dRoPM3C4fr0H6AAhOp2GV5 tTikDzBZVrMvGMTbiK4krSAHeASVJKfDBWwuZCF5Zb7JD8VwPspcWD1qpwkmdoeXkm2l RZWA== X-Received: by 10.66.164.196 with SMTP id ys4mr20583818pab.119.1448037595337; Fri, 20 Nov 2015 08:39:55 -0800 (PST) Original-Received: from Vulcan.local (76-234-68-79.lightspeed.frokca.sbcglobal.net. [76.234.68.79]) by smtp.gmail.com with ESMTPSA id jq3sm350274pbc.16.2015.11.20.08.39.54 (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 20 Nov 2015 08:39:54 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id E65B510A57B94; Fri, 20 Nov 2015 08:39:53 -0800 (PST) In-Reply-To: <83mvu96qjk.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 20 Nov 2015 10:09:03 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.5 (darwin) Mail-Followup-To: Eli Zaretskii , Juanma Barranquero , schwab@suse.de, eggert@cs.ucla.edu, rgm@gnu.org, deng@randomsample.de, emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::22e 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:194869 Archived-At: >>>>> Eli Zaretskii writes: > Alas, it's not just the pretest, it's the entire life time of the release > branch. That life time is just starting for the emacs-25 branch; I'm quite > certain that at lease Emacs 25.2 and probably also 25.3 will be delivered > from that branch. That's another 2 years. I don't think we want to wait that > long for your useful corrections and general loving care of ChangeLog.2 ;-) > > I hope we will find a better solution to this. Once 25.1 is out -- and this could take up to six months -- I'd like us to switch to a different process for point releases: A new .x release every two months, with whatever bug fixes have been accomplished in that interim. Once the emacs-25 branch is stable, say at 25.2, primary development would resume on master towards emacs-26. However, bugs will continue to be fixed and back-ported to emacs-25, with regular point releases from that branch, until it's stable enough to no longer need our attention. Beyond that point, it becomes a frozen branch -- unless a critical bug fix occurs justifying a point release solely for that fix. This requires a two-pronged approach: Attention to bugs on emacs-25, and attention to new features coming into master from patches and feature branches. This should allow us to maintain a faster turn-around time on bug fix releases, while not holding up integration of new feature work towards the next major release. The intention here is to maximize the utility of Git, now that we have it, and to make use of its branching, merging and cherry-picking capabilities to accelerate development, without sacrificing attention to stability for the current "release series". I like that we have gitmerge.el, for example; I hope we can adapt our release process to take full advantage of it. John