ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?)

[Artur Malabarba]

David Engster <address@hidden> writes:

> We still haven't figured out how to deal with the generated ChangeLogs,
> so I'm not sure we should merge at the moment.

Could you elaborate on what the issue is?

I thought if we just generated the changelogs independently for each of
the branches we would be fine (i.e., don't merge to master the changelog
commits on emacs-25).
Or is there something I overlooked about the process?