From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#21998: Run 'make change-history' on release branch Date: Tue, 08 Mar 2016 02:32:12 -0500 Message-ID: References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83vb50wxhv.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1457422401 8478 80.91.229.3 (8 Mar 2016 07:33:21 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Mar 2016 07:33:21 +0000 (UTC) Cc: 21998@debbugs.gnu.org, John Wiegley To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 08 08:33:12 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 1adC8i-00030k-Uy for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Mar 2016 08:33:09 +0100 Original-Received: from localhost ([::1]:60927 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adC8i-0004Jh-55 for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Mar 2016 02:33:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:57776) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adC8d-0004JO-O3 for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 02:33:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adC8c-0004BX-JD for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 02:33:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:41452) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adC8c-0004BT-FO for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 02:33:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1adC8c-0001nj-A4 for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 02:33:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 08 Mar 2016 07:33:02 +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.14574223506886 (code B ref 21998); Tue, 08 Mar 2016 07:33:02 +0000 Original-Received: (at 21998) by debbugs.gnu.org; 8 Mar 2016 07:32:30 +0000 Original-Received: from localhost ([127.0.0.1]:38579 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adC86-0001n0-4g for submit@debbugs.gnu.org; Tue, 08 Mar 2016 02:32:30 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:38401) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adC84-0001mm-OD for 21998@debbugs.gnu.org; Tue, 08 Mar 2016 02:32:29 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adC7u-00045r-DG for 21998@debbugs.gnu.org; Tue, 08 Mar 2016 02:32:23 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:33265) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adC7p-00045Q-Gg; Tue, 08 Mar 2016 02:32:13 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1adC7o-0000Zb-LJ; Tue, 08 Mar 2016 02:32:12 -0500 X-Spook: Shots fired Majic Hostage Mexican army Sears Tower Crash X-Ran: !z*[!He#K51d)lFOKy,X0S!"\>LGd>``^"-.4m}&VCV\gY8rI$,7MlC|)sivC1{4QT>H>Y X-Hue: blue X-Attribution: GM In-Reply-To: <83vb50wxhv.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 05 Mar 2016 21:11:40 +0200") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) 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:114561 Archived-At: Eli Zaretskii wrote: > I think if we care at all about having ChangeLog in the releases, we > should simply reinstate the file and maintain it in the repository. FWIW, that's not what I was hoping would come from this, and I think that would be a retrograde step. > if we don't do that, let's decide there will be no ChangeLog files in > the release tarballs at all, and stop worrying about these issues. It's an option; however, there are two issues, which aren't directly related: a) an undetermined number of people may be interested in following the history of Emacs changes without the VCS. Eg, those looking at release tarfiles. b) if you care about the quality of your history, you need a way to correct commit logs, which are (effectively) immutable in git. IMO Emacs should care about this, if only for legal reasons (eg you get the author wrong while committing, or forget "tiny change"). I care about b), but not really about a). Or maybe b) is irrelevant too, I don't know. Other options: 1) Fix the merging problem. Eg the idea of using differently named ChangeLog.2/.3 files for emacs-25 and master was mentioned. This is a mess for people in a) trying to follow the Clog in time order. 2) Go back to only allowing versioned ChangeLog.2 on master branch. This is least-effort, and removes the merging problem. a) doesn't benefit from corrections, but at least the legal corrections can be made in master. For 1) and 2), experience shows that few people will bother to make corrections. 3) Stop keeping a versioned ChangeLog.2 in the repo, include a generated, unfixed ChangeLog in release tarfiles. This addresses a) at some level but ignores b). 4) Develop a better method for correcting commit log errors. Eg, a file that lists problematic git hashes and the corrected log message. This could be similar to git notes, but could just be a text file. You'd need to develop a little bit of infrastructure to help people use the system. Recent experience suggests few people would use it. It would not have the merging problem that the current system does. It would address b), and a) if you used it while generating the ChangeLog. PS For the record, to explain the actual merging issue as I see it: Suppose emacs-25 and master are synced at revision aaa and ChangeLog.2 is up-to-date. emacs-25 advances to rev xxx, and independently master to rev xxx'. emacs-25 gets ChangeLog.2 updated, and merged to master. Now the footer of master ChangeLog.2 reports that it is up-to-date to rev xxx. What does this mean for the changes on master between aaa and xxx'? Because xxx on master is "after" xxx', I suspect it means they end up missing from ChangeLog.2 forever, which is bad. But maybe there's no such issue, or it is fixable with some git trivia. I don't know. That's why I made this bug report. AFAICS, the adopted "solution" was simply to ignore the issue, which means master/ChangeLog.2 is (probably) messed up at the moment.