From mboxrd@z Thu Jan  1 00:00:00 1970
Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail
From: Eli Zaretskii <eliz@gnu.org>
Newsgroups: gmane.emacs.devel
Subject: Re: ChangeLog.4
Date: Thu, 18 May 2023 20:44:06 +0300
Message-ID: <83edndv8k9.fsf@gnu.org>
References: <874job5p3n.fsf.ref@yahoo.com> <874job5p3n.fsf@yahoo.com>
 <877ct5zhdd.fsf@melete.silentflame.com>
Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214";
	logging-data="37153"; mail-complaints-to="usenet@ciao.gmane.io"
Cc: luangruo@yahoo.com, emacs-devel@gnu.org
To: Sean Whitton <spwhitton@spwhitton.name>
Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu May 18 19:44:38 2023
Return-path: <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>
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 <emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org>)
	id 1pzhg4-0009Qy-5y
	for ged-emacs-devel@m.gmane-mx.org; Thu, 18 May 2023 19:44:36 +0200
Original-Received: from localhost ([::1] helo=lists1p.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.90_1)
	(envelope-from <emacs-devel-bounces@gnu.org>)
	id 1pzhfQ-00085r-Nd; Thu, 18 May 2023 13:43:56 -0400
Original-Received: from eggs.gnu.org ([2001:470:142:3::10])
 by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>) id 1pzhfP-00085g-1b
 for emacs-devel@gnu.org; Thu, 18 May 2023 13:43:55 -0400
Original-Received: from fencepost.gnu.org ([2001:470:142:3::e])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1pzhfO-00082D-5Y; Thu, 18 May 2023 13:43:54 -0400
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
 s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date:
 mime-version; bh=V87VAPQrxWjDluibo/fEyjk2t0NHBbterpHjCVjJe3g=; b=I2q1nLWlLPXe
 PZu5ajxRRVKHHVoD+QhkCnAfIa9NblSwm0jgdptBN3Q8wF2JppNlZAQT+S5sIOtCMr99cNwe6n4GF
 EamEyXAy4w8pmvaiPj6uESXROKAwNAoIlNRTwnEDKCa0GcwCCUHEONLrKvD0sotF8p/vFLCQtTg8E
 GDXaSfN0H5+dTJWXzCsn9V4vL7tWFgblxtgXIF2tG4fwxO4bO9Ik3P216Vq+9tpQpdnsKXSXWZHT/
 jxHLFycVEjzMxj5lAaN4QTzABY3/qiL0FtdLDoamKXef/7XLYQ3s1yktxk+Hx8rLPChKuJ31xV/2S
 ggirg/4N0CKJJpzBoG1+Wg==;
Original-Received: from [87.69.77.57] (helo=home-c4e4a596f7)
 by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <eliz@gnu.org>)
 id 1pzhfN-0007Yn-Gm; Thu, 18 May 2023 13:43:53 -0400
In-Reply-To: <877ct5zhdd.fsf@melete.silentflame.com> (message from Sean
 Whitton on Thu, 18 May 2023 10:20:14 -0700)
X-BeenThere: emacs-devel@gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: "Emacs development discussions." <emacs-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/emacs-devel>
List-Post: <mailto:emacs-devel@gnu.org>
List-Help: <mailto:emacs-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-devel>,
 <mailto:emacs-devel-request@gnu.org?subject=subscribe>
Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org
Xref: news.gmane.io gmane.emacs.devel:306185
Archived-At: <http://permalink.gmane.org/gmane.emacs.devel/306185>

> From: Sean Whitton <spwhitton@spwhitton.name>
> Date: Thu, 18 May 2023 10:20:14 -0700
> 
> Looks like AUTHORS on master is somehow still the Emacs 28 version, too.

AUTHORS is not supposed to be merged, see gitmerge.el.  AUTHORS is
only important when tarring a release or a pretest, and that never
happens from master.