Re: Need review of emacs-25-merge branch

[Eli Zaretskii]

> From: Paul Eggert <address@hidden>
> Date: Tue, 29 Dec 2015 23:46:59 -0800
> 
> 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.

I guess the first merge should be fixed manually, and we should
hopefully have a better procedure some time soon.