Re: Freeze is almost here

[Eli Zaretskii]

> From: Achim Gratz <address@hidden>
> Date: Fri, 13 Nov 2015 21:05:14 +0100
> 
> Eli Zaretskii writes:
> > I see that you branched emacs-25 not from the latest master.  This
> > means all the commits since 9463abf will have to be cherry-picked from
> > master to the emacs-25 branch.
> 
> That's likely why John plans to merge master into the release branch
> again at some later time.  This postpones the actual freeze and avoids
> the superfluous cherry-picks.

Merging from master to the release branch will likely make a mess when
we later merge back the bugfixes.

Anyway, I already pushed all the cherry-picks (with a special marker
that should exempt them from merging back via gitmerge.el).