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:35:22 +0300 Message-ID: <83mur4sh0l.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> <83pnw0shk7.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org X-Trace: blaine.gmane.org 1540316080 17472 195.159.176.226 (23 Oct 2018 17:34:40 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2018 17:34:40 +0000 (UTC) Cc: 29366@debbugs.gnu.org To: rgm@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Oct 23 19:34:35 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 1gF0Zf-0004Pq-Ok for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Oct 2018 19:34:35 +0200 Original-Received: from localhost ([::1]:43576 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0bm-0006z2-4z for geb-bug-gnu-emacs@m.gmane.org; Tue, 23 Oct 2018 13:36:46 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:50574) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0b9-0006k2-Sw for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:36:08 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gF0b4-0001Y7-5I for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:36:07 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:34192) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gF0b4-0001Xu-0Y for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:36:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gF0b3-0006ZZ-SV for bug-gnu-emacs@gnu.org; Tue, 23 Oct 2018 13:36:01 -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:36: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.154031615025248 (code B ref 29366); Tue, 23 Oct 2018 17:36:01 +0000 Original-Received: (at 29366) by debbugs.gnu.org; 23 Oct 2018 17:35:50 +0000 Original-Received: from localhost ([127.0.0.1]:38450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0as-0006ZA-5i for submit@debbugs.gnu.org; Tue, 23 Oct 2018 13:35:50 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:40743) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gF0ar-0006Yx-DE for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:35:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gF0ah-0001H7-SA for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:35:44 -0400 Original-Received: from fencepost.gnu.org ([2001:4830:134:3::e]:55901) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gF0af-0001FS-SY for 29366@debbugs.gnu.org; Tue, 23 Oct 2018 13:35:39 -0400 Original-Received: from [176.228.60.248] (port=1320 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1gF0ae-0004Xr-FS; Tue, 23 Oct 2018 13:35:37 -0400 In-reply-to: <83pnw0shk7.fsf@gnu.org> (message from Eli Zaretskii on Tue, 23 Oct 2018 20:23:36 +0300) 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:151526 Archived-At: > Date: Tue, 23 Oct 2018 20:23:36 +0300 > From: Eli Zaretskii > Cc: 29366@debbugs.gnu.org > > > 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. But maybe we could keep a NEWS.XYZ file in the repository, and rename it as part of make-tarball.