From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#29366: gitmerge to handle NEWS better Date: Tue, 23 Oct 2018 20:23:36 +0300 Message-ID: <83pnw0shk7.fsf@gnu.org> References: <6rpo7lnkp5.fsf@fencepost.gnu.org> <87fu8g26ra.fsf@engster.org> <0gbmj4et6b.fsf@fencepost.gnu.org> <87bmj31zct.fsf@engster.org> <5hr2ggfv2m.fsf@fencepost.gnu.org> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1540315391 25927 195.159.176.226 (23 Oct 2018 17:23:11 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2018 17:23:11 +0000 (UTC) Cc: 29366@debbugs.gnu.org To: Glenn Morris Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 23 19:23:07 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 1gF0OY-0006ZG-0P for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Oct 2018 19:23:06 +0200 Original-Received: from localhost ([::1]:43543 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0Qe-0003TV-D1 for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Oct 2018 13:25:16 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0QT-0003SW-AD for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:25:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gF0QQ-0000Qy-Am for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:25:05 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gF0QQ-0000Qk-5z for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:25:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gF0QQ-0006IJ-20 for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:25:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Oct 2018 17:25:02 +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.154031544324121 (code B ref 29366); Tue, 23 Oct 2018 17:25:02 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 23 Oct 2018 17:24:03 +0000 Original-Received: from localhost ([127.0.0.1]:38445 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0PQ-0006Gf-DJ for submit@debbugs.gnu.org; Tue, 23 Oct 2018 13:24:00 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:37875) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0PP-0006GR-Hx for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:23:59 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gF0PF-00087v-I9 for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:23:52 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55676) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0PF-00087U-Ab for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:23:49 -0400 Original-Received: from [176.228.60.248] (port=4569 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gF0PD-0005ZR-Co; Tue, 23 Oct 2018 13:23:48 -0400 In-reply-to: <5hr2ggfv2m.fsf@fencepost.gnu.org> (message from Glenn Morris on Tue, 23 Oct 2018 13:10:09 -0400) 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:151525 Archived-At: > From: Glenn Morris > Date: Tue, 23 Oct 2018 13:10:09 -0400 > > 2) Perhaps etc/NEWS should always be called etc/NEWS.MAJORVERSION right > from the start, with etc/NEWS being just a symlink. I cannot use symlinks, sorry.