From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog and the release branch Date: Fri, 27 Nov 2015 09:26:47 +0200 Message-ID: <83mvtzuclk.fsf@gnu.org> References: <56538D97.80905@cs.ucla.edu> <87bnakgwvq.fsf@isaac.fritz.box> <877fl7lbjk.fsf_-_@gmail.com> <83610rz7pq.fsf@gnu.org> <87y4dkjwpn.fsf@yagnesh.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1448609262 22699 80.91.229.3 (27 Nov 2015 07:27:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 27 Nov 2015 07:27:42 +0000 (UTC) Cc: deng@randomsample.de, bruce.connor.am@gmail.com, emacs-devel@gnu.org To: Yagnesh Raghava Yakkala Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Nov 27 08:27:30 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1a2DRB-0008Kv-Sz for ged-emacs-devel@m.gmane.org; Fri, 27 Nov 2015 08:27:22 +0100 Original-Received: from localhost ([::1]:55146 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2DRD-0001MK-Mt for ged-emacs-devel@m.gmane.org; Fri, 27 Nov 2015 02:27:23 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50014) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2DQw-0001JN-08 for emacs-devel@gnu.org; Fri, 27 Nov 2015 02:27:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2DQs-0000o4-RR for emacs-devel@gnu.org; Fri, 27 Nov 2015 02:27:05 -0500 Original-Received: from mtaout27.012.net.il ([80.179.55.183]:56967) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2DQs-0000nN-JT for emacs-devel@gnu.org; Fri, 27 Nov 2015 02:27:02 -0500 Original-Received: from conversion-daemon.mtaout27.012.net.il by mtaout27.012.net.il (HyperSendmail v2007.08) id <0NYG00H00PS6QX00@mtaout27.012.net.il> for emacs-devel@gnu.org; Fri, 27 Nov 2015 09:21:59 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([84.94.185.246]) by mtaout27.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NYG00AXJPSNIR60@mtaout27.012.net.il>; Fri, 27 Nov 2015 09:21:59 +0200 (IST) In-reply-to: <87y4dkjwpn.fsf@yagnesh.org> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.183 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:195343 Archived-At: > From: Yagnesh Raghava Yakkala > Cc: Artur Malabarba , 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.