Re: ChangeLog and the release branch

[David Engster <deng@randomsample.de>]

Eli Zaretskii writes:
>> From: Yagnesh Raghava Yakkala <hi@yagnesh.org>
>> Cc: Artur Malabarba <bruce.connor.am@gmail.com>,
>> deng@randomsample.de, emacs-devel@gnu.org
>
>> Date: Fri, 27 Nov 2015 02:37:48 +0530
>> 
>> 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.
>
> How do you store the diffs in Git notes?  You can't easily write diffs
> by hand, so some script is needed to generate them and put them there.

I don't think you would store a diff there but the complete, corrected
ChangeLog.

> Other than that, perhaps this is what we should do.

If someone is volunteering to actually set this up and deal with the
aftermath of people struggling with 'git notes', then yes. Otherwise, I
think that Paul's suggestion to simply work with two separate ChangeLog
files is the best yet, but it would also need someone to make the
necessary changes in the gitlog-to-* scripts (skipping the commits that
originate from emacs-25).

-David