From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nikolaus Rath Newsgroups: gmane.emacs.devel Subject: Re: Is it time to drop ChangeLogs? Date: Fri, 11 Mar 2016 11:53:32 -0800 Message-ID: <87egbgeqpv.fsf@thinkpad.rath.org> References: <87y49vz4cg.fsf@acer.localhost.com> <64a52598-ad53-498c-993c-67d7827dbdfc@default> <838u1uuuau.fsf@gnu.org> <878u1um2xl.fsf@thinkpad.rath.org> <87fuw090k7.fsf@wanadoo.es> <83y49spuxt.fsf@gnu.org> <87pov4achc.fsf@acer.localhost.com> <83r3fkpb3u.fsf@gnu.org> <83lh5rps0t.fsf@gnu.org> <56E066BD.5050403@cs.ucla.edu> <83wpp9jt82.fsf@gnu.org> <87pov1dje9.fsf@thinkpad.rath.org> <83pov0j2c6.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1457726045 3700 80.91.229.3 (11 Mar 2016 19:54:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Mar 2016 19:54:05 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 11 20:53:56 2016 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 1aeT8F-000838-AM for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2016 20:53:55 +0100 Original-Received: from localhost ([::1]:57404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeT8E-0002Kn-CX for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2016 14:53:54 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeT80-0002Kf-FW for emacs-devel@gnu.org; Fri, 11 Mar 2016 14:53:41 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeT7v-0003v7-G1 for emacs-devel@gnu.org; Fri, 11 Mar 2016 14:53:40 -0500 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:55494) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeT7v-0003uz-A5 for emacs-devel@gnu.org; Fri, 11 Mar 2016 14:53:35 -0500 Original-Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 86E822043B for ; Fri, 11 Mar 2016 14:53:34 -0500 (EST) Original-Received: from frontend1 ([10.202.2.160]) by compute1.internal (MEProxy); Fri, 11 Mar 2016 14:53:34 -0500 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:content-type :date:from:in-reply-to:message-id:mime-version:references :subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=PJecmh1CNrPFTL2 9XZAs9FDTMxI=; b=jNvjMxFC27J0DlhRTwGNT3ePDXDs5bfqmCTu9drhrQsMh0V SA2iw8mkMarjL0wrEQ/XDDZYmsaJEdgf47yMkWwhnaOJvn7zrk8v+oo8zC4WCFhw cxm3RYvY2My9IDxwxdGGXSHa8TZ187hEd+Vl9iJ7FccocorfKT3F2nI60YRw= X-Sasl-enc: GsEpFX8wqxFFBdMuyh9NuerdRX5Tp/y3uSULWkpnaWHh 1457726014 Original-Received: from ebox.rath.org (ebox.rath.org [45.79.69.51]) by mail.messagingengine.com (Postfix) with ESMTPA id 3D5BBC00018 for ; Fri, 11 Mar 2016 14:53:34 -0500 (EST) Original-Received: from thinkpad.rath.org (thinkpad [192.168.12.2]) by ebox.rath.org (Postfix) with ESMTPS id 5E030214AC3 for ; Fri, 11 Mar 2016 19:53:33 +0000 (UTC) Original-Received: by thinkpad.rath.org (Postfix, from userid 1000) id 25E2AC4C10; Fri, 11 Mar 2016 11:53:33 -0800 (PST) Mail-Copies-To: never Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <83pov0j2c6.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 11 Mar 2016 20:28:57 +0200") User-Agent: Gnus/5.130014 (Ma Gnus v0.14) Emacs/24.4 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.28 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:201482 Archived-At: On Mar 11 2016, Eli Zaretskii wrote: >> From: Nikolaus Rath >> Date: Fri, 11 Mar 2016 09:17:02 -0800 >>=20 >> I think the low-tech option of a "commit-msg-override" directory with >> one (updated) commit message per file (and the file name being the hash >> of the commit being updated) is also still on the table. >>=20 >> This directory could be trivially checked by whatever tool will be used >> to turn the git log into a ChangeLog file. > > That could work, provided that Someone=E2=84=A2 will post the changes to = the > gitlog-to-changelog script (or maybe an entirely different script) to > produce ChangeLog from the log messages. > > This solution should also support merging from the release branch to > master and cherry-picks in the opposite direction, where (AFAIK) SHA1 > checksum is not necessarily left intact. I don't think *any* solution can support cherry-picks without extra manual work. Even if you keep the ChangeLog file under version control and edit it by hand, you have to cherry-pick the original commit plus the later commit that updated the ChangeLog. The same applies here, you have to cherry-pick both the original commit and the later one that created the "overwrite file" in the "commit-msg-override" directory. Best, -Nikolaus --=20 GPG encrypted emails preferred. Key id: 0xD113FCAC3C4E599F Fingerprint: ED31 791B 2C5C 1613 AF38 8B8A D113 FCAC 3C4E 599F =C2=BBTime flies like an arrow, fruit flies like a Banana.=C2= =AB