From: Eli Zaretskii <eliz@gnu.org>
To: Yagnesh Raghava Yakkala <hi@yagnesh.org>
Cc: deng@randomsample.de, bruce.connor.am@gmail.com, emacs-devel@gnu.org
Subject: Re: ChangeLog and the release branch
Date: Fri, 27 Nov 2015 09:26:47 +0200 [thread overview]
Message-ID: <83mvtzuclk.fsf@gnu.org> (raw)
In-Reply-To: <87y4dkjwpn.fsf@yagnesh.org>
> 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.
Other than that, perhaps this is what we should do.
Thanks.
next prev parent reply other threads:[~2015-11-27 7:26 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-23 20:36 When do we merge the commits from emacs-25 onto master? Artur Malabarba
2015-11-23 20:51 ` Eli Zaretskii
2015-11-23 22:05 ` Paul Eggert
2015-11-23 22:34 ` Artur Malabarba
2015-11-23 22:43 ` David Engster
2015-11-24 14:25 ` ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?) Artur Malabarba
2015-11-24 13:29 ` ChangeLog and the release branch Dmitry Gutov
2015-11-24 16:24 ` ChangeLog and the release branch (was: When do we merge the commits from emacs-25 onto master?) Eli Zaretskii
2015-11-26 21:07 ` ChangeLog and the release branch Yagnesh Raghava Yakkala
2015-11-27 7:26 ` Eli Zaretskii [this message]
2015-11-28 11:50 ` David Engster
2015-11-28 12:14 ` Eli Zaretskii
2015-11-28 12:36 ` David Engster
2015-11-28 19:15 ` John Wiegley
2015-11-24 18:32 ` When do we merge the commits from emacs-25 onto master? Eli Zaretskii
2015-11-24 19:33 ` David Engster
2015-11-24 19:46 ` Paul Eggert
2015-11-24 20:14 ` Eli Zaretskii
2015-11-24 22:04 ` Paul Eggert
2015-11-25 0:35 ` David Engster
2015-11-25 6:32 ` Paul Eggert
2015-11-25 18:18 ` Eli Zaretskii
2015-11-25 18:16 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83mvtzuclk.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=bruce.connor.am@gmail.com \
--cc=deng@randomsample.de \
--cc=emacs-devel@gnu.org \
--cc=hi@yagnesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).