From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#22506: make change-history now doesn't work at all Date: Sun, 31 Jan 2016 12:53:46 -0800 Organization: UCLA Computer Science Department Message-ID: <56AE745A.1090402@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070904040407010000060804" X-Trace: ger.gmane.org 1454273667 11506 80.91.229.3 (31 Jan 2016 20:54:27 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 31 Jan 2016 20:54:27 +0000 (UTC) Cc: Nicolas Petton To: Glenn Morris , 22506@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Jan 31 21:54:14 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 1aPz0f-0005Tr-2J for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Jan 2016 21:54:13 +0100 Original-Received: from localhost ([::1]:43196 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPz0b-0001dx-1g for geb-bug-gnu-emacs@m.gmane.org; Sun, 31 Jan 2016 15:54:09 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:48893) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPz0X-0001ds-Jq for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 15:54:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPz0U-0003Ef-Dm for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 15:54:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:55255) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPz0U-0003Eb-A8 for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 15:54:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1aPz0U-00064x-51 for bug-gnu-emacs@gnu.org; Sun, 31 Jan 2016 15:54:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 31 Jan 2016 20:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 22506 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 22506-submit@debbugs.gnu.org id=B22506.145427363723355 (code B ref 22506); Sun, 31 Jan 2016 20:54:02 +0000 Original-Received: (at 22506) by debbugs.gnu.org; 31 Jan 2016 20:53:57 +0000 Original-Received: from localhost ([127.0.0.1]:43475 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPz0P-00064c-En for submit@debbugs.gnu.org; Sun, 31 Jan 2016 15:53:57 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:33030) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1aPz0N-00064P-AR for 22506@debbugs.gnu.org; Sun, 31 Jan 2016 15:53:56 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 6A14C160F53; Sun, 31 Jan 2016 12:53:48 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id JtT39J4ZKYa8; Sun, 31 Jan 2016 12:53:47 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 31A5B160F54; Sun, 31 Jan 2016 12:53:47 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id Yc48OD_aqArq; Sun, 31 Jan 2016 12:53:47 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 01872160F53; Sun, 31 Jan 2016 12:53:46 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 In-Reply-To: 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:112158 Archived-At: This is a multi-part message in MIME format. --------------070904040407010000060804 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Glenn Morris wrote: > Package: emacs > Version: 25.0.90 > > I don't know how y'all plan to address the issue of running make > change-history on the release branch (bug#21998), but now it doesn't > work on either emacs-25 or master. On both branches, > change-history-nocommit fails with "fatal: Invalid revision range". I reproduced the problem and installed the attached patches to the emacs-25 and master branches to try to fix it. In the master branch this problem was introduced by my commit ffbf163ab5ced1bc464a0034e6abc9a41f5e09c4 dated Sat Jan 30 14:45:53 2016 -0800. I did this commit by hand, not by using 'make change-history', and evidently I messed it up. In the emacs-25 branch this problem was introduced by Nicolas Petton's commit e6b7b6d89ff9288a49099f041752908b5eb9613e dated Sat Jan 30 14:39:23 2016 +0100, which updated ChangeLog.2's end commit from 8a8613bcf4227dfe46a694b761e9575bdf6ca2ce (by me dated Sat Nov 7 23:52:17 2015 -0800) to d5195155f9a297dc45a40c9b7175715ffe4f1612 (a commit ID that does not exist in the Emacs repository). My guess is that Nicolas ran 'make change-history' on a private branch and then merged the result into emacs-25. This has never worked, and it's why Makefile.in tries to check for this sort of thing. I vaguely recall telling Nicolas to ignore the checks and do the right thing, but it's not at all clear what the right thing is and there should be little wonder that it went awry. I guess from now on we should take those checks more seriously. We also need to improve the procedure for keeping track of history, as the current procedure does not work well at all. We're better off than we were when ChangeLog files were maintained by hand in parallel with commit messages, but the by-hand maintenance of ChangeLog.2 is still too much trouble. I've proposed a way to improve this but to be honest I'd rather just dump the by-hand maintenance entirely and this has meant I'm not motivated to work on the problem. --------------070904040407010000060804 Content-Type: text/x-diff; name="0001-Fix-ChangeLog.2-commit-ID.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-ChangeLog.2-commit-ID.patch" >From f6c1d42be0798c6dae9a5ab65cc1e0506a444e37 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 31 Jan 2016 12:18:03 -0800 Subject: [PATCH] ; Fix ChangeLog.2 commit ID. --- ChangeLog.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.2 b/ChangeLog.2 index 27c6ce3..5921546 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -26338,7 +26338,7 @@ This file records repository revisions from commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to -commit d5195155f9a297dc45a40c9b7175715ffe4f1612 (inclusive). +commit e6b7b6d89ff9288a49099f041752908b5eb9613e (inclusive). See ChangeLog.1 for earlier changes. ;; Local Variables: -- 2.5.0 --------------070904040407010000060804 Content-Type: text/x-diff; name="0001-Fix-ChangeLog.2-commit-ID.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-ChangeLog.2-commit-ID.patch" >From d8d5f401aeb371019ae6b1b8089250d9d7fb3240 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 31 Jan 2016 12:37:11 -0800 Subject: [PATCH] ; Fix ChangeLog.2 commit ID. --- ChangeLog.2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ChangeLog.2 b/ChangeLog.2 index c5cba03..12f9834 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 @@ -28545,7 +28545,7 @@ This file records repository revisions from commit 9d56a21e6a696ad19ac65c4b405aeca44785884a (exclusive) to -commit 3f43da09956b663d92f578e41bcacb8742bb6bba (inclusive). +commit ffbf163ab5ced1bc464a0034e6abc9a41f5e09c4 (inclusive). See ChangeLog.1 for earlier changes. ;; Local Variables: -- 2.5.0 --------------070904040407010000060804--