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 12:08:09 -0800 Message-ID: <87bn6keq1i.fsf@thinkpad.rath.org> References: <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> <87egbgeqpv.fsf@thinkpad.rath.org> <838u1oixx0.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 1457726909 17448 80.91.229.3 (11 Mar 2016 20:08:29 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Mar 2016 20:08:29 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 11 21:08:20 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 1aeTMB-0001mE-8W for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2016 21:08:19 +0100 Original-Received: from localhost ([::1]:57455 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTMA-0006aN-K5 for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2016 15:08:18 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47120) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTM7-0006a7-KZ for emacs-devel@gnu.org; Fri, 11 Mar 2016 15:08:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeTM3-00088a-KE for emacs-devel@gnu.org; Fri, 11 Mar 2016 15:08:15 -0500 Original-Received: from out4-smtp.messagingengine.com ([66.111.4.28]:51446) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTM3-00088W-G5 for emacs-devel@gnu.org; Fri, 11 Mar 2016 15:08:11 -0500 Original-Received: from compute2.internal (compute2.nyi.internal [10.202.2.42]) by mailout.nyi.internal (Postfix) with ESMTP id 1823B203F8 for ; Fri, 11 Mar 2016 15:08:11 -0500 (EST) Original-Received: from frontend2 ([10.202.2.161]) by compute2.internal (MEProxy); Fri, 11 Mar 2016 15:08:11 -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=a7dX+mM0qWNxGJq fb63r+4ZbLOU=; b=UepCoHAnfKD628LfTMFTrBDPFhlwKxkNSOSAAnbdCKPK3US a9UzW9jbfGdm1Zx1U12w5hqy0hsNL7YlbtLyDX7/XbirE9XQ2gmq/X3Pj3UxlsK5 LwdYy2ft5gQt+/8mHPf9HpX8FZ3UFktRrgfTgKGcJQ2jy9XsucBpSnjvFpYw= X-Sasl-enc: sn8aIwpwp56J3lx7/1C1pdIq7Yq7tToqwLIaDqOIfio+ 1457726890 Original-Received: from ebox.rath.org (ebox.rath.org [45.79.69.51]) by mail.messagingengine.com (Postfix) with ESMTPA id C92306800B1 for ; Fri, 11 Mar 2016 15:08:10 -0500 (EST) Original-Received: from thinkpad.rath.org (thinkpad [192.168.12.2]) by ebox.rath.org (Postfix) with ESMTPS id 14E7B214C04 for ; Fri, 11 Mar 2016 20:08:10 +0000 (UTC) Original-Received: by thinkpad.rath.org (Postfix, from userid 1000) id CB825C4C10; Fri, 11 Mar 2016 12:08:09 -0800 (PST) Mail-Copies-To: never Mail-Followup-To: emacs-devel@gnu.org In-Reply-To: <838u1oixx0.fsf@gnu.org> (Eli Zaretskii's message of "Fri, 11 Mar 2016 22:04:27 +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:201484 Archived-At: Hi Eli, Please do not Cc me on replies, I am reading the list. On Mar 11 2016, Eli Zaretskii wrote: >> From: Nikolaus Rath >> Date: Fri, 11 Mar 2016 11:53:32 -0800 >>=20 >> > 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. >>=20 >> 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. > > ChangeLog is updated in the same commit as the code, so cherry-picking > brings them both to the other branch. Or maybe I misunderstand what > you mean by "the later commit"? We are talking about the case were the ChangeLog entry / original commit message was incorrect and need to be corrected later (in the "later commit"). 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