Re: Need review of emacs-25-merge branch

[Paul Eggert]

John Wiegley wrote:
> The resulting merge fails to build for me for the same reason that emacs-25
> does: the ucs-normalize.el build failure.

That build failure was fixed in emacs-25 on Fri Dec 25 13:23:17 2015 +0200, by 
Eli in commit 94a3606243d3923ac457aeff33f3ce82b65ef6cd “Fix bootstrap broken by 
changes related to OS X file-name encoding”. I don’t observe it in a fresh build 
now on either emacs-25 (commit ce106f3de6b016a474e2591dea9226a3741effee) or 
emacs-25-merge (commit ec0a80cc283badc7f7fd5ef78512dde6d34b1355). My guess is 
that you need to build from scratch rather than rely on ‘make’ to figure out 
exactly which files are obsolete.

One problem I noticed with the merge is ChangeLog.2. I don't see how ‘make 
change-history’ will work in the master branch now. For example, if you are in a 
directory where emacs-25-merge is current and rename that branch to master with 
‘git branch -m emacs-25-merge master’ and then run ‘make 
change-history-nocommit’, you should observe duplicate entries in ChangeLog.2, 
which is not good.