From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Tue, 23 Oct 2018 13:10:09 -0400 Message-ID: <5hr2ggfv2m.fsf@fencepost.gnu.org> References: <6rpo7lnkp5.fsf@fencepost.gnu.org> <87fu8g26ra.fsf@engster.org> <0gbmj4et6b.fsf@fencepost.gnu.org> <87bmj31zct.fsf@engster.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1540314546 23735 195.159.176.226 (23 Oct 2018 17:09:06 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2018 17:09:06 +0000 (UTC) User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) To: 29366@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 23 19:09:02 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0Aw-00063b-E4 for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Oct 2018 19:09:02 +0200 Original-Received: from localhost ([::1]:43458 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0D2-0005kg-OR for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Oct 2018 13:11:12 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:43276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0Cu-0005kF-0d for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:11:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gF0Cs-0007Na-Bj for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:11:04 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34181) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gF0Cs-0007NO-6f for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:11:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gF0Cr-0003vx-TO for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:11:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Glenn Morris Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Oct 2018 17:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 29366 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 29366-submit@debbugs.gnu.org id=B29366.154031462615076 (code B ref 29366); Tue, 23 Oct 2018 17:11:01 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 23 Oct 2018 17:10:26 +0000 Original-Received: from localhost ([127.0.0.1]:38437 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0CG-0003uw-9e for submit@debbugs.gnu.org; Tue, 23 Oct 2018 13:10:26 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:33534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0CF-0003ui-4L for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:10:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gF0C8-0006va-3Z for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:10:17 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55262) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0C7-0006vJ-Tn for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:10:16 -0400 Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.82) (envelope-from ) id 1gF0C2-00048p-Js; Tue, 23 Oct 2018 13:10:10 -0400 X-Spook: Wildfire Soviet Audiotel LLNL beanpole high security DES X-Ran: ^l_Z3(qOrSYouf??r4yS}gzd7\|wD=o~bX?(dU~!Y58>KYve[ahb3&TawET4ZzgANrTF6c X-Hue: green X-Attribution: GM In-Reply-To: (Glenn Morris's message of "Tue, 12 Dec 2017 22:06:33 -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" Xref: news.gmane.org gmane.emacs.bugs:151524 Archived-At: Today I noticed that this still goes wrong sometimes. See the obvious mistake in http://lists.gnu.org/rl/emacs-diffs/2018-10/msg00163.html where a change ends up in etc/NEWS when it should have gone to NEWS.26. (Presumably this means git somehow merged it without a conflict? I have no idea how it could merge it to that position.) See also the other corrections I then found to be needed in http://lists.gnu.org/r/emacs-diffs/2018-10/msg00165.html I guess I repeat my comments from http://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html 1) It's a shame there's no proper rename tracking 2) Perhaps etc/NEWS should always be called etc/NEWS.MAJORVERSION right from the start, with etc/NEWS being just a symlink.