From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Merging release branch Date: Sat, 06 Nov 2021 12:14:34 -0400 Message-ID: References: <83o86xbpkk.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="20373"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Nov 06 17:15:38 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mjOLy-00056M-2E for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 17:15:38 +0100 Original-Received: from localhost ([::1]:47380 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mjOLw-0001EP-Fz for ged-emacs-devel@m.gmane-mx.org; Sat, 06 Nov 2021 12:15:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:50726) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjOKw-0000Xh-TJ for emacs-devel@gnu.org; Sat, 06 Nov 2021 12:14:35 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:46818) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mjOKw-0004n2-KJ; Sat, 06 Nov 2021 12:14:34 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Nkdk9sZkMfj1iSxhy0Eb/fRmo+PT+NZWV033lgb2dSo=; b=M8pBceo3hNksprRg7phd C2Rni0s4QFbOuily1758wpT5M535Ue4/XD17mvXPwQGhJuGaL2jQKW9349nuZcG3KRY9AulIN1chB 57v09gLVQiLqOq+iZi8YCfjTiinfLy8F15VzU1WzrDYaIzXs4oh/zxwxsrwLe3yPGthLYPB5jRxKi ltYrI6rkx2W+47MyPsdcus3dC5xcFyPujT7UEyeCNwHcmgdR2fZBBo8kZbxrsgFghjsL11vc34UdZ rKGHJaVJ7KjeVO9IAtA9xL0299ge7uRKwCiSBI/2Gj5Da6PkdZAEPfar0/kL2iPjXF5c5mlEoT5Q0 KvHgoODMLnlb/A==; Original-Received: from rgm by fencepost.gnu.org with local (Exim 4.90_1) (envelope-from ) id 1mjOKw-0001MF-Ea; Sat, 06 Nov 2021 12:14:34 -0400 X-Spook: Cyber Command Power lines Atlas Ft. Knox White Powder X-Ran: j3Ds[fj{*&^YbNG1\=iE~5K%kv.`~kTkHXh?jm)o%IWB}U_Cgt~c{o[Qv1}B$M9*u,NiYM X-Hue: yellow X-Attribution: GM In-Reply-To: (Stefan Kangas's message of "Sat, 6 Nov 2021 03:53:07 -0700") X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:278876 Archived-At: Stefan Kangas wrote: > (I don't know how Glenn has done it until now.) Using the tools in the Emacs repository, and documented in eg admin/notes/git-workflow > AFAIK, there is no strong need to name that file etc/NEWS until we > create a tarball or run "make install". I think we should just keep the > file in etc/NEWS.NN even on the release branch. That would avoid the > merging headache, and the file would also preserve its full history > between versions (no more moving the file). See previous discussions in eg https://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html https://debbugs.gnu.org/29366