Re: make change-history on non-master branches

[Glenn Morris]

Eli Zaretskii wrote:

> Right.  But if we merge ChangeLog.2 from the release branch to master,
> then this will produce a mess when "make change-history" is run on
> master, no?  I mean, some entries will appear twice, once after
> corrections, the other without.  No?

Quite possibly. I don't know exactly what happens if the commit hash
from the ChangeLog.2 footer were to get merged between branches.

I don't know how to solve this problem, but it seems to me that it needs
to be solved, and the more master and emacs-25 diverge, the worse it
gets.

(All I can say, which I know isn't helpful, is that if the corrections
were stored on a per commit-basis, this issue would not arise, AFAICS.)