Re: ChangeLog and the release branch

[Yagnesh Raghava Yakkala]

Hello Eli,

>> 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).
>
> We could do that, but then the manual corrections to ChangeLog.2 made
> on the branch would have to be done again, manually, on master.

I may be totally wrong, but I think we can have a clean solution by not fixing
Changelog manually, but storing the diff of Changelog (of that commit) in git
notes.

And while generating Changelog

- retrieve changelog from commit message
- apply diff from git notes (if available)
- Finally store it in the Changelog file.

IIUC, this could work on any branch.

Yagnesh.