Re: Next release from master

[John Wiegley]

>>>>> Glenn Morris <address@hidden> 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