all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Teemu Likonen <tlikonen@iki.fi>
To: John Wiegley <jwiegley@gmail.com>
Cc: "Óscar Fuentes" <ofv@wanadoo.es>, emacs-devel@gnu.org
Subject: Re: Next release from master
Date: Thu, 11 Feb 2016 18:59:45 +0200	[thread overview]
Message-ID: <87egcji3ni.fsf@iki.fi> (raw)
In-Reply-To: <m2r3gjp8wx.fsf@newartisans.com> (John Wiegley's message of "Thu,  11 Feb 2016 10:24:14 -0500")

[-- Attachment #1: Type: text/plain, Size: 1390 bytes --]

(cl-incf option)

  - master: This is the release branch for versions with new features.
    Releases are Git-tagged: emacs-25.1. After the release new features
    are added or merged here (see feature branches below).

  - maint: When a release happens from master the master branch is
    merged here. Bug fixes are added here (if a bug fix release is
    planned). Releases are Git-tagged: emacs-25.2. This branch is merged
    to master occasionally.

  - next: Wild zone and test branch for new features. Feature branches
    (see below) and the master branch are merged here. This is never
    merged anywhere. Maybe a cleanup sometimes: "git reset --hard
    master".

  - [any feature-specific branch]: There can be any number of
    feature-specific branches for new features. These are merged to next
    when a wider testing is wanted. When feature is ready and the master
    is open these are merged to master (and can be discarded).

From users' and downstream point of view: Those who always want the most
stable version will follow "maint". Those who want the normal next
release branch will follow "master". For testing the latest features one
would use "next" or manually merge any feature branches to one's own.

-- 
/// Teemu Likonen   - .-..   <https://github.com/tlikonen> //
// PGP: 4E10 55DC 84E9 DFF6 13D7 8557 719D 69D3 2453 9450 ///

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 818 bytes --]

  parent reply	other threads:[~2016-02-11 16:59 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-12  7:09 emacs-25 merge pushed, please confirm John Wiegley
2016-01-12 11:12 ` Alex Bennée
2016-01-12 16:19   ` John Wiegley
2016-01-17 23:04 ` Next release from master Stefan Monnier
2016-01-17 23:10   ` John Wiegley
2016-01-18  9:06     ` Michael Albinus
2016-01-18 15:55       ` Eli Zaretskii
2016-01-18 20:06         ` Michael Albinus
2016-01-18 20:25           ` Eli Zaretskii
2016-01-18 15:55     ` Eli Zaretskii
2016-01-18 21:13       ` John Wiegley
2016-01-18 21:31         ` Daniel Colascione
2016-01-18 21:43           ` John Wiegley
2016-01-18 21:45             ` Daniel Colascione
2016-01-18 21:51               ` John Wiegley
2016-01-18 22:15                 ` Stefan Monnier
2016-01-18 22:18                   ` John Wiegley
2016-01-19  3:36               ` Eli Zaretskii
2016-01-18 15:54   ` Eli Zaretskii
2016-01-21 17:35   ` Glenn Morris
2016-01-21 17:58     ` Eli Zaretskii
2016-02-04 17:39       ` Glenn Morris
2016-02-04 20:31         ` John Wiegley
2016-02-08 13:41           ` Stefan Monnier
2016-02-08 15:54             ` John Wiegley
2016-02-08 16:47               ` Dmitry Gutov
2016-02-09 14:55                 ` John Wiegley
2016-02-09 15:15                   ` Dmitry Gutov
2016-02-09 14:57               ` Stefan Monnier
2016-02-09 22:38                 ` Lars Ingebrigtsen
2016-02-09 23:42                   ` Rasmus
2016-02-10  0:09                     ` Kaushal Modi
2016-02-10  0:38                       ` Óscar Fuentes
2016-02-10  2:04                         ` Lars Ingebrigtsen
2016-02-10  2:42                           ` Óscar Fuentes
2016-02-10  3:00                             ` Lars Ingebrigtsen
2016-02-10  3:43                               ` Óscar Fuentes
2016-02-10  4:01                                 ` Lars Ingebrigtsen
2016-02-10  3:28                             ` Alexis
2016-02-10  3:33                               ` Dmitry Gutov
2016-02-10  4:02                                 ` Óscar Fuentes
2016-02-10  4:13                                   ` Dmitry Gutov
2016-02-10  4:51                                     ` Alexis
2016-02-10  5:28                                       ` Dmitry Gutov
2016-02-10 18:10                                         ` Eli Zaretskii
2016-02-10  4:58                                     ` Óscar Fuentes
2016-02-10  5:07                                       ` Lars Ingebrigtsen
2016-02-10  5:16                                         ` Dmitry Gutov
2016-02-10 18:09                                           ` Eli Zaretskii
2016-02-10 18:09                                         ` Eli Zaretskii
2016-02-10  5:08                                       ` Alexis
2016-02-10  5:10                                       ` Dmitry Gutov
2016-02-10 18:08                                       ` Eli Zaretskii
2016-02-10 18:03                                     ` Eli Zaretskii
2016-02-10  4:04                                 ` Alexis
2016-02-10  4:23                                   ` Dmitry Gutov
2016-02-10 18:07                                     ` Eli Zaretskii
2016-02-10 17:58                                 ` Eli Zaretskii
2016-02-11 17:21                                   ` Paul Eggert
2016-02-11 18:11                                     ` John Wiegley
2016-02-10 17:56                               ` Eli Zaretskii
2016-02-11  3:35                             ` Daniel Colascione
2016-02-11  3:55                               ` Óscar Fuentes
2016-02-11 15:24                                 ` John Wiegley
2016-02-11 16:07                                   ` Mark Oteiza
2016-02-11 16:20                                   ` Óscar Fuentes
2016-02-11 16:59                                   ` Teemu Likonen [this message]
2016-02-11 19:33                                   ` Daniel Colascione
2016-02-10  2:34                         ` Kaushal Modi
2016-02-10  3:24                           ` Óscar Fuentes
2016-02-10 21:46                         ` Rasmus
2016-02-10 16:40                   ` John Wiegley
2016-02-10 17:18                     ` Dmitry Gutov
2016-02-10 16:41                 ` John Wiegley
2016-02-10 17:07                   ` Dmitry Gutov
2016-02-10 18:06                   ` Óscar Fuentes
2016-02-11  3:47                     ` Daniel Colascione
2016-01-22  1:01     ` John Wiegley
2016-01-22  1:28       ` Dmitry Gutov
2016-01-22  1:42         ` Paul Eggert
2016-01-22  3:50           ` Xue Fuqiao
2016-01-22  1:46         ` John Wiegley
2016-01-22  1:48           ` Dmitry Gutov
2016-01-22  1:56             ` John Wiegley
2016-01-22  7:32               ` Eli Zaretskii
2016-01-22  7:38                 ` John Wiegley
2016-01-22 14:59                   ` Barry Fishman
2016-01-22 17:45                     ` John Wiegley
2016-01-22 21:27                       ` Barry Fishman
2016-01-23  1:47                         ` John Wiegley
2016-01-25 10:38                           ` Alex Bennée
2016-01-25 15:56                             ` Eli Zaretskii
2016-01-23  5:17                         ` Stefan Monnier
2016-01-23 17:09                           ` Barry Fishman
2016-01-23 20:06                             ` John Wiegley
2016-01-24  4:26                               ` Stefan Monnier
2016-01-24 14:11                                 ` Eli Zaretskii
2016-01-24 18:04                                   ` Stefan Monnier
2016-01-24 18:35                                     ` Eli Zaretskii
2016-01-25  2:20                                       ` Stefan Monnier
2016-01-22  7:26           ` Eli Zaretskii
2016-01-22  8:10             ` Michael Albinus
2016-01-22  8:25               ` Eli Zaretskii
2016-01-22  8:58                 ` Nicolas Petton
2016-01-22  9:02                   ` Michael Albinus
2016-01-22 17:42                     ` John Wiegley
2016-01-22 19:02                       ` Michael Albinus
2016-01-22 19:16                         ` Alan Mackenzie
2016-01-22 21:22                           ` Eli Zaretskii
2016-01-22  7:11       ` Eli Zaretskii
2016-01-23  5:25       ` Stefan Monnier
  -- strict thread matches above, loose matches on Subject: below --
2016-02-11 16:28 Angelo Graziosi
2016-02-11 17:09 ` John Wiegley
2016-02-11 17:26   ` Paul Eggert
2016-02-11 17:27   ` Angelo Graziosi
2016-02-11 21:08     ` Eli Zaretskii
2016-02-11 21:04   ` Eli Zaretskii
2016-02-11 19:36 ` Stefan Monnier
2016-02-11 19:40   ` John Wiegley
2016-02-12 12:34   ` Richard Stallman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87egcji3ni.fsf@iki.fi \
    --to=tlikonen@iki.fi \
    --cc=emacs-devel@gnu.org \
    --cc=jwiegley@gmail.com \
    --cc=ofv@wanadoo.es \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.