From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kaushal Modi Subject: Re: Branch "next" garbled Date: Thu, 11 Oct 2018 23:17:46 -0400 Message-ID: References: <84ftxn45jn.fsf@gmail.com> <87h8i3nfjv.fsf@nicolasgoaziou.fr> <87k1mokkg2.fsf@gmail.com> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary="000000000000cb9cb80577ff8840" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:60003) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gAnxj-0002B6-8a for emacs-orgmode@gnu.org; Thu, 11 Oct 2018 23:18:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gAnxi-00030i-Ad for emacs-orgmode@gnu.org; Thu, 11 Oct 2018 23:18:03 -0400 Received: from mail-lf1-x12e.google.com ([2a00:1450:4864:20::12e]:45062) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gAnxi-000304-35 for emacs-orgmode@gnu.org; Thu, 11 Oct 2018 23:18:02 -0400 Received: by mail-lf1-x12e.google.com with SMTP id m80-v6so8261498lfi.12 for ; Thu, 11 Oct 2018 20:18:00 -0700 (PDT) In-Reply-To: <87k1mokkg2.fsf@gmail.com> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: "Emacs-orgmode" To: Adrian Bradd Cc: Marco Wahl , emacs-orgmode@gnu.org, Nicolas Goaziou --000000000000cb9cb80577ff8840 Content-Type: text/plain; charset="UTF-8" On Thu, Oct 11, 2018, 9:46 PM Adrian Bradd wrote: > > Sorry if this is obvious, but what is the next branch > Simply put, the next branch is even more bleeding edge than the master. Bleeding-edgeness: next > master > maint - maint :: gets published to Org Elpa, etc. Right now the version there is 9.1.x. This branch only takes bug and doc fixes right now - master :: this is the soon(TM)-to-be released Org 9.2 version. This has quite a many features (including few breaking) on top of Org 9.1.x. As this version is planned to be released soon, the plan is to not touch this branch for the time being as it gets tested out more. Touch this only for doc and bug fixes for Org 9.2. - next :: This branch is open to all sorts of commits. Changes here won't be visible until the next to next major Org release (probably 9.3?). In general, you would always commit to the most stable branch first and then merge that to the next less stable branch in succession. The less stable branch always contains all commits (as-is or merged) from the more stable branch. It isn't mentioned on worg in the developers section either > (https://orgmode.org/worg/dev/index.html). > My understanding is that the next branch is not a long term thing. > --000000000000cb9cb80577ff8840 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Thu, Oct = 11, 2018, 9:46 PM Adrian Bradd <adrian.bradd@gmail.com> wrote= :

Sorry if this is obvious, but what is the next branch

Simply put, the next b= ranch is even more bleeding edge than the master.=C2=A0

Bleeding-edgeness: next > master > ma= int

- maint :: gets publ= ished to Org Elpa, etc. Right now the version there is 9.1.x. This branch o= nly takes bug and doc fixes right now
- master :: th= is is the soon(TM)-to-be released Org 9.2 version. This has quite a many fe= atures (including few breaking) on top of Org 9.1.x. As this version is pla= nned to be released soon, the plan is to not touch this branch for the time= being as it gets tested out more. Touch this only for doc and bug fixes fo= r Org 9.2.
- next :: This branch is open to all sort= s of commits. Changes here won't be visible until the next to next majo= r Org release (probably 9.3?).=C2=A0

In general, you would always commit to the most stable branch = first and then merge that to the next less stable branch in succession.=C2= =A0

The less stable bran= ch always contains all commits (as-is or merged) from the more stable branc= h.=C2=A0

It isn't mentioned on worg i= n the developers section either
(https://orgmode.org/worg/dev/index.htm= l).

My understanding is that the next branch is not a long term thing.= =C2=A0
--000000000000cb9cb80577ff8840--