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: Fri, 04 Mar 2016 11:46:49 -0500 Message-ID: References: <56BE7E37.3090708@cs.ucla.edu> <4hd1rw1ubr.fsf@fencepost.gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1457110325 5448 80.91.229.3 (4 Mar 2016 16:52:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 4 Mar 2016 16:52:05 +0000 (UTC) To: 21998@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Fri Mar 04 17:51:56 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 1absxC-0001bl-SY for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Mar 2016 17:51:51 +0100 Original-Received: from localhost ([::1]:42316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1absxC-0003Je-BW for geb-bug-gnu-emacs@m.gmane.org; Fri, 04 Mar 2016 11:51:50 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56235) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abssZ-0003WR-M9 for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2016 11:47:04 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abssY-00061l-PT for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2016 11:47:03 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:36843) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abssY-00061U-Mu for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2016 11:47:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84) (envelope-from ) id 1abssY-0003u9-GI for bug-gnu-emacs@gnu.org; Fri, 04 Mar 2016 11:47:02 -0500 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 04 Mar 2016 16:47: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.145711001814999 (code B ref 21998); Fri, 04 Mar 2016 16:47:02 +0000 Original-Received: (at 21998) by debbugs.gnu.org; 4 Mar 2016 16:46:58 +0000 Original-Received: from localhost ([127.0.0.1]:33970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1abssU-0003tq-IU for submit@debbugs.gnu.org; Fri, 04 Mar 2016 11:46:58 -0500 Original-Received: from eggs.gnu.org ([208.118.235.92]:36975) by debbugs.gnu.org with esmtp (Exim 4.84) (envelope-from ) id 1abssT-0003tf-NY for 21998@debbugs.gnu.org; Fri, 04 Mar 2016 11:46:57 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1abssN-0005wU-MS for 21998@debbugs.gnu.org; Fri, 04 Mar 2016 11:46:52 -0500 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:34749) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1abssN-0005wE-Jv for 21998@debbugs.gnu.org; Fri, 04 Mar 2016 11:46:51 -0500 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1abssM-00084c-1n; Fri, 04 Mar 2016 11:46:50 -0500 X-Spook: Biological weapon DNDO Keylogger Ammonium nitrate Uzi CID X-Ran: L^qPHN5jl1I4r'.H&LWk(,n@R^wtgdLo|.tP@xEf;Hj?9snAX"7<$!:j_tt"v(U5?~+j.f X-Hue: magenta X-Attribution: GM 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:114414 Archived-At: Glenn Morris wrote: > The point of this report was that merging between branches will create a > complete mess. I hope people appreciate this point. For example, the Feb 15th merge skipped the "Auto-commit of ChangeLog" cc6d906 but did not skip "make change-history-commit" 2b7d006. Obviously this makes no sense and means the master ChangeLog is in some weird messed-up state. But even without this specific problem, it still would be, since, as I said a long time ago, AFAICS there's no sensible way to merge this stuff between branches, which is why it was disabled on non-master branches to start with. At this point, I give up, since it seems fairly clear that maintaining an accurate ChangeLog just isn't of interest. Even the bare minimum legally relevant mistakes (missing "tiny change") don't seem to be being corrected. Probably just deleting it from the repo would be more honest. This will simplify things, eg the "correct log entries" step for making a release can be dropped, and the AUTHORS file can become less accurate. A rough non-versioned ChangeLog can still be generated for tarballs, if anyone cares. Or, a version of the above, stop keeping a versioned copy on any branch but master.