From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Yagnesh Raghava Yakkala Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog and the release branch Date: Fri, 27 Nov 2015 02:37:48 +0530 Message-ID: <87y4dkjwpn.fsf@yagnesh.org> References: <56538D97.80905@cs.ucla.edu> <87bnakgwvq.fsf@isaac.fritz.box> <877fl7lbjk.fsf_-_@gmail.com> <83610rz7pq.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1448572108 27032 80.91.229.3 (26 Nov 2015 21:08:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 26 Nov 2015 21:08:28 +0000 (UTC) Cc: deng@randomsample.de, Artur Malabarba , emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Nov 26 22:08:10 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 1a23lu-0006Xy-Eu for ged-emacs-devel@m.gmane.org; Thu, 26 Nov 2015 22:08:06 +0100 Original-Received: from localhost ([::1]:53158 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a23lw-0002YR-LI for ged-emacs-devel@m.gmane.org; Thu, 26 Nov 2015 16:08:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46404) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a23lt-0002YJ-8a for emacs-devel@gnu.org; Thu, 26 Nov 2015 16:08:05 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a23ls-0001zo-G2 for emacs-devel@gnu.org; Thu, 26 Nov 2015 16:08:05 -0500 Original-Received: from mccarthy.hcoop.net ([69.90.123.73]:38760) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a23lo-0001z0-OQ; Thu, 26 Nov 2015 16:08:00 -0500 Original-Received: from [117.202.57.181] (helo=mail.hcoop.net) by mccarthy.hcoop.net with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84) (envelope-from ) id 1a23ll-0005n6-BG; Thu, 26 Nov 2015 16:07:58 -0500 In-Reply-To: <83610rz7pq.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 24 Nov 2015 18:24:17 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.1.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 69.90.123.73 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:195318 Archived-At: 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.