[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
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.
- When do we merge the commits from emacs-25 onto master?, Artur Malabarba, 2015/11/23
- Re: When do we merge the commits from emacs-25 onto master?, Eli Zaretskii, 2015/11/23
- Re: When do we merge the commits from emacs-25 onto master?, Paul Eggert, 2015/11/23
- Re: When do we merge the commits from emacs-25 onto master?, Artur Malabarba, 2015/11/23
- Re: When do we merge the commits from emacs-25 onto master?, David Engster, 2015/11/23
- ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?), Artur Malabarba, 2015/11/24
- Re: ChangeLog and the release branch, Dmitry Gutov, 2015/11/24
- Re: ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?), Eli Zaretskii, 2015/11/24
- Re: ChangeLog and the release branch,
Yagnesh Raghava Yakkala <=
- Re: ChangeLog and the release branch, Eli Zaretskii, 2015/11/27
- Re: ChangeLog and the release branch, David Engster, 2015/11/28
- Re: ChangeLog and the release branch, Eli Zaretskii, 2015/11/28
- Re: ChangeLog and the release branch, David Engster, 2015/11/28
- Re: ChangeLog and the release branch, John Wiegley, 2015/11/28
- Re: When do we merge the commits from emacs-25 onto master?, Eli Zaretskii, 2015/11/24
- Re: When do we merge the commits from emacs-25 onto master?, David Engster, 2015/11/24
- Re: When do we merge the commits from emacs-25 onto master?, Paul Eggert, 2015/11/24
- Re: When do we merge the commits from emacs-25 onto master?, Eli Zaretskii, 2015/11/24
- Re: When do we merge the commits from emacs-25 onto master?, Paul Eggert, 2015/11/24