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: Re: Next release from master Date: Thu, 21 Jan 2016 17:01:50 -0800 Message-ID: References: <8qegda3kfg.fsf@fencepost.gnu.org> Reply-To: John Wiegley NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1453424539 1918 80.91.229.3 (22 Jan 2016 01:02:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 22 Jan 2016 01:02:19 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Jan 22 02:02:13 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 1aMQ7A-0004oZ-Kb for ged-emacs-devel@m.gmane.org; Fri, 22 Jan 2016 02:02:12 +0100 Original-Received: from localhost ([::1]:50229 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMQ79-000591-NB for ged-emacs-devel@m.gmane.org; Thu, 21 Jan 2016 20:02:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMQ6w-00058s-PR for emacs-devel@gnu.org; Thu, 21 Jan 2016 20:01:59 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aMQ6t-0004sx-J8 for emacs-devel@gnu.org; Thu, 21 Jan 2016 20:01:58 -0500 Original-Received: from mail-pa0-x22a.google.com ([2607:f8b0:400e:c03::22a]:35195) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aMQ6t-0004st-Bx for emacs-devel@gnu.org; Thu, 21 Jan 2016 20:01:55 -0500 Original-Received: by mail-pa0-x22a.google.com with SMTP id ho8so31867615pac.2 for ; Thu, 21 Jan 2016 17:01:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:in-reply-to:date:message-id:references:user-agent :reply-to:mail-followup-to:mime-version:content-type; bh=EPuHWqu9aWFiVCG7YJqQ++r5mHMAzOcsMVULSD5rAGk=; b=T8k7CZG9RRYygu498GpRU3jZl7uLDmUswTda2flhv683LrB626gCAxbs6KVUoB4sLf 1YVqzpVlvYAsoB/zXjX6e+fB4C4wxFNwMLGisOehbh4oOgxn7fsPaDe7QAaWj09Hx5CA AeKk3Y19aOvbR9Wjo8sDMP6zq+W77groJ5q81uiur6QCkrXmWS0xymCsvAsGMmXq3lQ/ A8/iKplKPTJ81D6wn0Rwb+p3V6yx05S4nHetFvMKfyWqIo7QSjHu7wz0QX1u8ClMLvDB 6oSP11p718SaVMuld9LX5OSTzYLFCjHA4yN3eW4BvmR/j9vIcI88sgbxo+Y5YnfDRrU+ ahFw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:in-reply-to:date:message-id :references:user-agent:reply-to:mail-followup-to:mime-version :content-type; bh=EPuHWqu9aWFiVCG7YJqQ++r5mHMAzOcsMVULSD5rAGk=; b=NP/JliF4h9bOSvHCYDsnrxwPtm6n9D5/gQost9gGQa9u4KYIydstuxEw0ERfC+JHU0 FeJt/1JQr4S/mzdbjzPNz3zgaHhOJV0bVrRUizvqTJV3PiQWUkapsh1mjNPaPzGmsA6r imuW2+3OpoZCDUhKo2UbkymntDSRkhJQVmI3Skg/V8fO+6RIX8NTdnDAzdYgqMrWUYPS QyVzZ9MP0thZBmuwMJGubg6yRydKSkQnc6z6pjo+QaIroE8FyazZ/iM9KYCqlNtBLfXb MryS7MF8j+hsLbnwf19RFGzUoLjCPtIl1Q0e1xjJIII8fFvCurYpGk3lzK+mAH698EQh 3aKg== X-Gm-Message-State: AG10YOTe9iDrs6v0veA7UeVOS5Ovz+B4vi4DRbbM7NCaUInpXSBViQmrLlISQLpoIrurIg== X-Received: by 10.66.162.9 with SMTP id xw9mr457976pab.46.1453424514479; Thu, 21 Jan 2016 17:01:54 -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 ty5sm5113208pac.48.2016.01.21.17.01.53 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 21 Jan 2016 17:01:53 -0800 (PST) X-Google-Original-From: "John Wiegley" Original-Received: by Vulcan.local (Postfix, from userid 501) id A482312560BAF; Thu, 21 Jan 2016 17:01:52 -0800 (PST) In-Reply-To: <8qegda3kfg.fsf@fencepost.gnu.org> (Glenn Morris's message of "Thu, 21 Jan 2016 12:35:15 -0500") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.5 (darwin) Mail-Followup-To: emacs-devel@gnu.org X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2607:f8b0:400e:c03::22a 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:198542 Archived-At: >>>>> Glenn Morris writes: > This means that if all goes as planned: 26.1 might not contain any "major" > new features, and 25.2 will never exist. I'm not sure yet what the best "role" for master is. Should it accumulate new work toward 25.2 while we work on 25.1, or should it accumulate work toward 26.1? 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"?). When freezing for 25.2, we would merge master into emacs-25 and then work on 25.2 while 'master' becomes the place for future 25.3 changes. At some point, we'll decide we don't want 25.x, but we really want to cut 26. At that time 'next' should be merged into 'master', and sanity checked for. If we are sane, then we cut 'emacs-26', master heads toward 26.2, next heads toward 27, etc. -- John Wiegley GPG fingerprint = 4710 CF98 AF9B 327B B80F http://newartisans.com 60E1 46C4 BD1A 7AC1 4BA2