From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: ChangeLog.4 Date: Thu, 18 May 2023 21:27:57 +0300 Message-ID: <83bkihv6j6.fsf@gnu.org> References: <874job5p3n.fsf.ref@yahoo.com> <874job5p3n.fsf@yahoo.com> <877ct5zhdd.fsf@melete.silentflame.com> <83edndv8k9.fsf@gnu.org> <87y1lly1ej.fsf@melete.silentflame.com> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23342"; mail-complaints-to="usenet@ciao.gmane.io" Cc: luangruo@yahoo.com, emacs-devel@gnu.org To: Sean Whitton Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu May 18 20:28:27 2023 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 1pziMV-0005so-No for ged-emacs-devel@m.gmane-mx.org; Thu, 18 May 2023 20:28:27 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pziLs-0004fU-Qa; Thu, 18 May 2023 14:27:48 -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 ) id 1pziLp-0004f4-7J for emacs-devel@gnu.org; Thu, 18 May 2023 14:27:45 -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 ) id 1pziLo-0003EA-Vg; Thu, 18 May 2023 14:27:44 -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=ZNs9fTgqh1seTgA6Mxt86ghlDP8zHWsvEUnsM4SFnyQ=; b=WHAH1DdFXo+z 1qPZWYmyzp+kOLKkxBzZB94PB3GIvbLty4W3/fZEeG2sGGAHj9sCCS3JPeVUewB5gj5Ee0mPQqxzq ikzFNNkeIXlAA8ErFuVYUpY7qUiUIsQmK/sVm9C+lkX/VO+4lc9K+aKmIMFr8hBTZKBz/odyjgpaK YCIXQhzI8cXdBLEsuT5T6XEVysbvwPHzl2L4fXCyHImTd7/psOXrMcDWRi7D/zetYQWN2NnOvoreF N+4EorxNEgG2SqnwmPi4CUCnHRS7PMXl5Gm+fadS8dDnSnO4I1Vj/EOJpe5d4xfSbdcDlR59gzapZ rUVbIbk3LnPqrLHITzXqoA==; 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 ) id 1pziLo-0004gV-BY; Thu, 18 May 2023 14:27:44 -0400 In-Reply-To: <87y1lly1ej.fsf@melete.silentflame.com> (message from Sean Whitton on Thu, 18 May 2023 10:50:28 -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-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.devel:306187 Archived-At: > From: Sean Whitton > Cc: luangruo@yahoo.com, emacs-devel@gnu.org > Date: Thu, 18 May 2023 10:50:28 -0700 > > > 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. > > Ah sure, but then, how did it end up being the Emacs 29 version on > master and not some much older version? Because we don't take any special measures to prevent it from being merged, so sometimes it does, depending on who does the merge. It's no big deal. AUTHORS reflects the state of the branch from which it is regenerated, and that is never master, so even if we merge AUTHORS, its contents doesn't reflect the contributions in master anyway.