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: Is it time to drop ChangeLogs? Date: Fri, 11 Mar 2016 22:04:27 +0200 Message-ID: <838u1oixx0.fsf@gnu.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> <87egbgeqpv.fsf@thinkpad.rath.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457726718 14294 80.91.229.3 (11 Mar 2016 20:05:18 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 11 Mar 2016 20:05:18 +0000 (UTC) Cc: emacs-devel@gnu.org To: Nikolaus Rath Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Mar 11 21:05:16 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 1aeTJD-0007t0-K6 for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2016 21:05:15 +0100 Original-Received: from localhost ([::1]:57451 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTJ9-0005Og-IW for ged-emacs-devel@m.gmane.org; Fri, 11 Mar 2016 15:05:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46430) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTJ1-0005KK-BQ for emacs-devel@gnu.org; Fri, 11 Mar 2016 15:05:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeTIx-0007EQ-B3 for emacs-devel@gnu.org; Fri, 11 Mar 2016 15:05:03 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:52884) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeTIx-0007EM-8C; Fri, 11 Mar 2016 15:04:59 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:4014 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1aeTIw-0002jk-GS; Fri, 11 Mar 2016 15:04:58 -0500 In-reply-to: <87egbgeqpv.fsf@thinkpad.rath.org> (message from Nikolaus Rath on Fri, 11 Mar 2016 11:53:32 -0800) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2001:4830:134:3::e 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:201483 Archived-At: > From: Nikolaus Rath > Date: Fri, 11 Mar 2016 11:53:32 -0800 > > > 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. 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"? > 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. I hoped for some post-commit hook that could do that automatically, or at least suggest that another commit needs to be picked.