Re: Next release from master

[Dmitry Gutov]

On 01/22/2016 04:01 AM, John Wiegley wrote:

> 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?

Why not get back to the simpler scheme? "New work" will go into the next 
major release (26.1, in this case), into master.

25.2 should only contain the minor tweaks and fixes we would accept into 
25.1 now (with feature freeze in effect), but don't manage to get into 
25.1 because of lack of time, or in case the respective bugs get filed 
too late (after 25.1's release).

So, 25.2 might not get released at all. But it probably will, and it'll 
be cut from emacs-25, like the branch's name implies.