[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: ChangeLog and the release branch

From: Yagnesh Raghava Yakkala
Subject: Re: ChangeLog and the release branch
Date: Fri, 27 Nov 2015 02:37:48 +0530
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux)

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

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.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]