Re: Next release from master

[Rasmus]

Lars Ingebrigtsen <address@hidden> writes:

> Stefan Monnier <address@hidden> writes:
>
>>>> How should we know/decide if something is intended for 26.1 or for 25.2?
>>> An excellent question. 25.x should not change APIs, without compelling 
>>> reason;
>>> adding new functionality might be OK, but depends on the scope.  The best 
>>> rule
>>> of thumb is: when in doubt, ask here.
>>
>> IOW, "master" is not really open for changes?
>
> I think this is all kinda confusing.  In the past, we've had one release
> branch (currently emacs-25) and one branch for development (of "normal",
> uncontroversial features).  I think that worked very well.  If we're now
> to be in a tripartite world of
> release-branch/kinda-sorta-next-release-branch-which-is-called-master/new-feature-branch
> world, that's both unusual and I would give us virtually no testing of
> new-feature-branch (since most developers just live on "master").

I agree.  Feature branches are annoying from a testing point of view.  It
would have to be a very exciting branch before I’d bother to merge it...

Rasmus

-- 
This is the kind of tedious nonsense up with which I will not put