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: Tue, 08 Mar 2016 18:08:15 +0200 Message-ID: <83egblrlzk.fsf@gnu.org> References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> <83vb50wxhv.fsf@gnu.org> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1457453374 28237 80.91.229.3 (8 Mar 2016 16:09:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 8 Mar 2016 16:09:34 +0000 (UTC) Cc: 21998@debbugs.gnu.org, johnw@gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Mar 08 17:09:19 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 1adKCE-00004y-Pg for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Mar 2016 17:09:19 +0100 Original-Received: from localhost ([::1]:35548 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adKC9-0007pe-2s for geb-bug-gnu-emacs@m.gmane.org; Tue, 08 Mar 2016 11:09:13 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:38194) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adKC4-0007mB-9z for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 11:09:09 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adKBy-0001hI-EB for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 11:09:08 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:42750) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adKBy-0001hC-AR for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 11:09:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1adKBy-000282-7B for bug-gnu-emacs@gnu.org; Tue, 08 Mar 2016 11:09: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: Tue, 08 Mar 2016 16:09: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.14574533028135 (code B ref 21998); Tue, 08 Mar 2016 16:09:02 +0000 Original-Received: (at 21998) by debbugs.gnu.org; 8 Mar 2016 16:08:22 +0000 Original-Received: from localhost ([127.0.0.1]:39877 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adKBK-000279-2v for submit@debbugs.gnu.org; Tue, 08 Mar 2016 11:08:22 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:47011) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1adKBI-00026x-5j for 21998@debbugs.gnu.org; Tue, 08 Mar 2016 11:08:20 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1adKB7-0001XD-A3 for 21998@debbugs.gnu.org; Tue, 08 Mar 2016 11:08:15 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:42019) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1adKB5-0001Wl-7S; Tue, 08 Mar 2016 11:08:07 -0500 Original-Received: from 84.94.185.246.cable.012.net.il ([84.94.185.246]:2713 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA1:128) (Exim 4.82) (envelope-from ) id 1adKB3-00025V-Sg; Tue, 08 Mar 2016 11:08:06 -0500 In-reply-to: (message from Glenn Morris on Tue, 08 Mar 2016 02:32:12 -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:114576 Archived-At: > From: Glenn Morris > Cc: John Wiegley , 21998@debbugs.gnu.org > Date: Tue, 08 Mar 2016 02:32:12 -0500 > > > 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. Can you tell why? It solves all the problems you mention in your mail, at negligible costs. So it seems to be a clear winner. > For 1) and 2), experience shows that few people will bother to make > corrections. Is it an important drawback that few people bother to make corrections? If it is, then any solution that involves such corrections is not what we want. Also, is the situation with corrections worse or better than what it was when we maintained ChangeLog files in the repository? > 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. No, they don't end up missing. They will in general be in the "wrong" order, time-wise, though. But what is the "right" order for this situation, where changes are made in parallel on several branches? Do we want them interwoven, in strict order of their commit times? Or do we want all the entries of a merge from the branch be kept together with the time stamp of the merge? If we want to continue keeping a single generated ChangeLog file on master and on the branch, we need to decide what is the desired result. > But maybe there's no such issue, or it is fixable with some git > trivia. The only "git trivia" that's possible is a custom merge driver (which AFAIK doesn't exist). Git itself is not aware of the special meaning of the time stamps in ChangeLog entries. We could also have some Lisp rearranging the entries in whatever order we decide we want it, after git-merge-changelog puts them in the order it thinks is right. > 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. It is not messed, but it isn't in chronological order, either. And it looks like no one ran "make change-history" on master for several moons, so problems might become worse when they do.