Re: Marking changes to be backported

[Eli Zaretskii]

> From: Stefan Monnier <address@hidden>
> Date: Mon, 06 Oct 2014 09:25:49 -0400
> Cc: Emacs developers <address@hidden>
> 
> > Yet more branches sounds more complicated to me (doesn't that mean you
> > need to know when you make a change where it should go?),
> 
> One way or another, someone will have to decide which change goes "in
> the current pretest" (let's call it 24.4), "in the next bug-fix" (let's
> call it 24.5), or "longer term" (let's call it 25.1).

The dilemma is only between the 2 out of 3 branches, those that get
bugfixes.  One of them should only get very safe fixes for serious
problems, which should then be merged to the other.

As for trunk vs the other 2 branches, I think the decision is simple:
new features and changes that don't fix bugs go to trunk only.