From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Artur Malabarba Newsgroups: gmane.emacs.devel Subject: RE: GIT mirror of Lisp dev sources [was: Char-folding: how can we implement matching...] Date: Tue, 1 Dec 2015 23:37:02 +0000 Message-ID: References: <8737vm2fan.fsf@red-bean.com> <0239bc4e-2682-4d73-a8ba-c5030c9fd28e@default> Reply-To: bruce.connor.am@gmail.com NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a11c2636a8033670525dea2e7 X-Trace: ger.gmane.org 1449013032 7875 80.91.229.3 (1 Dec 2015 23:37:12 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 1 Dec 2015 23:37:12 +0000 (UTC) Cc: Karl Fogel , Eli Zaretskii , emacs-devel To: Drew Adams Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Dec 02 00:37:11 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 1a3uTu-0004dR-BZ for ged-emacs-devel@m.gmane.org; Wed, 02 Dec 2015 00:37:10 +0100 Original-Received: from localhost ([::1]:55392 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3uTt-0001Vh-Lp for ged-emacs-devel@m.gmane.org; Tue, 01 Dec 2015 18:37:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34603) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3uTq-0001Tw-JK for emacs-devel@gnu.org; Tue, 01 Dec 2015 18:37:07 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a3uTp-0007xN-GX for emacs-devel@gnu.org; Tue, 01 Dec 2015 18:37:06 -0500 Original-Received: from mail-lf0-x234.google.com ([2a00:1450:4010:c07::234]:35581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a3uTn-0007uz-I0; Tue, 01 Dec 2015 18:37:03 -0500 Original-Received: by lfdl133 with SMTP id l133so29521363lfd.2; Tue, 01 Dec 2015 15:37:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:reply-to:sender:in-reply-to:references:date:message-id :subject:from:to:cc:content-type; bh=s/dIKHd1w0ZYbEtwg/FQ6wXT6ewMMprO9Ra8+7lP6Zo=; b=NaF1Qb7fhnydqNwsTgsXvM7mYKdpuGaRU+YfxWsWHht9dgG9Dco/SSBIZsM1Z883rl hBIXRUJ6MFcCnxafjRodm8ifmHbHprBMv9gKRObvZZHgIPRoJkLmiR834trJgruWh5Qf wDF5D/jiXEMyF54ePj3HkcSWmjv1lWW8qI+SFSlKT0J7EKJ1P+4idt7SoyIScHkx+v5N lzpiGYzqNKH0/LYaHTtk0Zsouo/Qtqt4VFCKPHG6LvIqTM+/wJBng+qCFei9fuhB30LG cU6p8+5UyO7XtVhTi13aOQUOC/yckkXcLy0KRNqVs0L4597EZfwXexpABell/dpIyRtV V1DA== X-Received: by 10.112.170.7 with SMTP id ai7mr101966lbc.102.1449013022828; Tue, 01 Dec 2015 15:37:02 -0800 (PST) Original-Received: by 10.112.202.99 with HTTP; Tue, 1 Dec 2015 15:37:02 -0800 (PST) In-Reply-To: <0239bc4e-2682-4d73-a8ba-c5030c9fd28e@default> X-Google-Sender-Auth: E49HfJzbZmsWQyc16g6v9OUdQcs X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:4010:c07::234 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:195724 Archived-At: --001a11c2636a8033670525dea2e7 Content-Type: text/plain; charset=UTF-8 On 1 Dec 2015 9:18 pm, "Drew Adams" wrote: > > > > > (Why doesn't master hold the latest developments, just as > > > > (IIUC) it has always done in the past?) > > > > > > During release stabilization, at least in recent releases that > > > I can remember, the maintainers have asked that changes go to > > > the release branch first and then get ported to 'master' later. > > > > Except for new features, that is. The emacs-25 branch is for > > refining what will get release. The master branch is still > > the place where we add brand new stuff. > > This is a new feature, is it not? Are we supposed to look to > `master' only for an initial implementation of a new feature, > and then look to an `emacs-N' branch for its post-branching > improvement? A few weeks ago, Emacs 25 entered feature freeze. This means a new branch called emacs-25 was created (at the time, it contained everything that was on master). Since then, any new features should go to the master branch, while bug fixes and refinements should go to the emacs-25 branch (these are later merged onto master too). This way we can have several months to polish off the next release (on the emacs-25 branch) without forcing everybody to stop adding shiny new things (the shiny new things are just added to master instead). The character-folding feature was added to master before the feature freeze. So it is now part of the emacs-25 branch. Any further refinements to this feature will therefore go on the emacs-25 branch (to make sure the release is as good as possible). --001a11c2636a8033670525dea2e7 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable

On 1 Dec 2015 9:18 pm, "Drew Adams&quo= t; <drew.adam= s@oracle.com> wrote:
>
> > > > (Why doesn't master hold the latest developments, j= ust as
> > > > (IIUC) it has always done in the past?)
> > >
> > > During release stabilization, at least in recent releases th= at
> > > I can remember, the maintainers have asked that changes go t= o
> > > the release branch first and then get ported to 'master&= #39; later.=C2=A0
> >
> > Except for new features, that is. The emacs-25 branch is for
> > refining what will get release. The master branch is still
> > the place where we add brand new stuff.
>
> This is a new feature, is it not?=C2=A0 Are we supposed to look to
> `master' only for an initial implementation of a new feature,
> and then look to an `emacs-N' branch for its post-branching
> improvement?

A few weeks ago, Emacs 25 entered feature freeze. This means a new branc= h called emacs-25 was created (at the time, it contained everything that wa= s on master). Since then, any new features should go to the master branch, = while bug fixes and refinements should go to the emacs-25 branch (these are= later merged onto master too).

This way we can have several months t= o polish off the next release (on the emacs-25 branch) without forcing ever= ybody to stop adding shiny new things (the shiny new things are just added = to master instead).

The character-folding feature was added to master= before the feature freeze. So it is now part of the emacs-25 branch. Any f= urther refinements to this feature will therefore go on the emacs-25 branch= (to make sure the release is as good as possible).

--001a11c2636a8033670525dea2e7--