From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#21998: Run 'make change-history' on release branch Date: Wed, 09 Mar 2016 18:51:05 +0200 Message-ID: <831t7jppc6.fsf@gnu.org> References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83oaaquvif.fsf@gnu.org> <83egbkrfez.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457542346 9292 80.91.229.3 (9 Mar 2016 16:52:26 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 9 Mar 2016 16:52:26 +0000 (UTC) Cc: 21998@debbugs.gnu.org To: rms@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Mar 09 17:52:15 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1adhLK-0004IC-A9 for geb-bug-gnu-emacs@m.gmane.org; Wed, 09 Mar 2016 17:52:14 +0100 Original-Received: from localhost ([::1]:42558 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhLJ-0003Yb-NY for geb-bug-gnu-emacs@m.gmane.org; Wed, 09 Mar 2016 11:52:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:52541) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhLC-0003Xu-9h for bug-gnu-emacs@gnu.org; Wed, 09 Mar 2016 11:52:10 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adhL8-0002zc-9P for bug-gnu-emacs@gnu.org; Wed, 09 Mar 2016 11:52:06 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:44628) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhL8-0002zY-68 for bug-gnu-emacs@gnu.org; Wed, 09 Mar 2016 11:52:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1adhL8-0002Fy-0s for bug-gnu-emacs@gnu.org; Wed, 09 Mar 2016 11:52:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 09 Mar 2016 16:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 21998 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 21998-submit@debbugs.gnu.org id=B21998.14575422768621 (code B ref 21998); Wed, 09 Mar 2016 16:52:01 +0000 Original-Received: (at 21998) by debbugs.gnu.org; 9 Mar 2016 16:51:16 +0000 Original-Received: from localhost ([127.0.0.1]:41755 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adhKN-0002Ey-OP for submit@debbugs.gnu.org; Wed, 09 Mar 2016 11:51:15 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:33098) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adhKM-0002Em-S9 for 21998@debbugs.gnu.org; Wed, 09 Mar 2016 11:51:15 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adhKE-0002iy-N8 for 21998@debbugs.gnu.org; Wed, 09 Mar 2016 11:51:09 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:41597) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adhKE-0002is-KJ for 21998@debbugs.gnu.org; Wed, 09 Mar 2016 11:51:06 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:3892 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1adhK1-0008M1-Kl; Wed, 09 Mar 2016 11:50:54 -0500 In-reply-to: (message from Richard Stallman on Wed, 09 Mar 2016 11:38:24 -0500) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:114654 Archived-At: > From: Richard Stallman > CC: rgm@gnu.org, 21998@debbugs.gnu.org > Date: Wed, 09 Mar 2016 11:38:24 -0500 > > I am trying to understand the situation from what I read in some of > these messages. If the ChangeLog files are only generated from the > Git log mssages, which cannot be corrected, then how does fixing ChangeLog > entries work? We fix the generated ChangeLog. The person who makes a mistake is supposed to invoke "make change-history", which updates the file ChangeLog.2 with the log messages of the recent commits (by running Git with a suitably computed command line), and then edit the updated file and commit the result. "make change-history" incrementally updates ChangeLog.2, so the next time it is invoked, only the later commits will be added to the file. This worked, more or less, as long as we only developed on master (except that not everyone who made mistakes bothered to correct them). But as soon as we started to work on both master and the release branch, this broke down because merges from the release branch to master don't live well with the manual corrections. This was never fixed because there appears to be no motivation for fixing it.