From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Engster Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog and the release branch Date: Sat, 28 Nov 2015 12:50:46 +0100 Message-ID: <87bnaepckp.fsf@isaac.fritz.box> References: <56538D97.80905@cs.ucla.edu> <87bnakgwvq.fsf@isaac.fritz.box> <877fl7lbjk.fsf_-_@gmail.com> <83610rz7pq.fsf@gnu.org> <87y4dkjwpn.fsf@yagnesh.org> <83mvtzuclk.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1448711483 28538 80.91.229.3 (28 Nov 2015 11:51:23 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 28 Nov 2015 11:51:23 +0000 (UTC) Cc: Yagnesh Raghava Yakkala , Paul Eggert , bruce.connor.am@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Nov 28 12:51:07 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 1a2e1x-0002wQ-Nm for ged-emacs-devel@m.gmane.org; Sat, 28 Nov 2015 12:51:05 +0100 Original-Received: from localhost ([::1]:60463 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2e20-0007GS-Rc for ged-emacs-devel@m.gmane.org; Sat, 28 Nov 2015 06:51:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45381) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2e1x-0007D7-Jn for emacs-devel@gnu.org; Sat, 28 Nov 2015 06:51:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2e1u-0007OA-CM for emacs-devel@gnu.org; Sat, 28 Nov 2015 06:51:05 -0500 Original-Received: from randomsample.de ([5.45.97.173]:36574) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2e1u-0007MU-3V; Sat, 28 Nov 2015 06:51:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=randomsample.de; s=a; h=Content-Type:MIME-Version:Message-ID:Date:References:In-Reply-To:Subject:Cc:To:From; bh=oxuDhaLEQYOmpVSo/mHGfYWVxqmbKynp0q5IHYPSzsM=; b=S8xhpkv+9CKGGbWqXiveMh8DbQ6bw6a4Mgt+x4qejGMce4kfcTV7dtpb9hdPfkUY5ln8VXBHOowJJiJolZlKEC1Wfr8jXdSBxtvF7sK3y8CZv1J8PUgoYkrECrmujpEg; Original-Received: from ip4d1645ea.dynamic.kabel-deutschland.de ([77.22.69.234] helo=isaac.fritz.box) by randomsample.de with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.80) (envelope-from ) id 1a2e1i-0005V8-Og; Sat, 28 Nov 2015 12:50:50 +0100 In-Reply-To: <83mvtzuclk.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 27 Nov 2015 09:26:47 +0200") User-Agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.5 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 5.45.97.173 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:195454 Archived-At: Eli Zaretskii writes: >> 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. 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