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: Wed, 17 May 2023 18:39:22 +0300 Message-ID: <837ct7x905.fsf@gnu.org> References: <874job5p3n.fsf.ref@yahoo.com> <874job5p3n.fsf@yahoo.com> <83ttwbxkrm.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2480"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: luangruo@yahoo.com Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed May 17 17:40:06 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 1pzJG1-0000Qw-Fl for ged-emacs-devel@m.gmane-mx.org; Wed, 17 May 2023 17:40:05 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pzJFN-0007bj-3O; Wed, 17 May 2023 11:39:25 -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 1pzJFD-0007Pp-1N for emacs-devel@gnu.org; Wed, 17 May 2023 11:39:15 -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 1pzJFB-0002rh-4f; Wed, 17 May 2023 11:39:14 -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=hiMRu+sGo4mPiaLdbu4J0qrrIAt/Zxc7UAKuQ6RyqJg=; b=T0BFQzZARNYq 9t/JWLLYahr7e4U5FrOW/wug43Cvc5lSG2oEmM2UiRC2ZPI/LNzLNXv9o81dl9ixzr9ZrGvGQG6x9 gHNX+rfU7h6uJDlLX1iJx8ptXMUTzPGaO6cAkAUeAkDm7KtvgDOXM3Lv+Bv9B5wQnYyJbXTvV1C89 smx8+qHq/8rzIq4gn4C3+iGLk85RQ7IC6sqNFRyPXCiM/8t0apDcDnRB1KIWQxuKzHBL90AOre8hv mmn8h0RyVqv0lOFJN4zHRCvOL5MOWClY0ePvvZUkadAvZV/ZDDkrBWEDdobTNONBa4oOVhoz9FHYY 5m1+m9uBfpS/FjvO52NRiA==; 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 1pzJF9-0003Sj-IY; Wed, 17 May 2023 11:39:12 -0400 In-Reply-To: <83ttwbxkrm.fsf@gnu.org> (message from Eli Zaretskii on Wed, 17 May 2023 14:25:17 +0300) 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:306162 Archived-At: > Date: Wed, 17 May 2023 14:25:17 +0300 > From: Eli Zaretskii > Cc: emacs-devel@gnu.org > > > From: Po Lu > > Date: Wed, 17 May 2023 16:39:08 +0800 > > > > Every change after: > > > > 2022-04-04 Eli Zaretskii > > > > * Version 28.1 released. > > > > appears to have been made on: > > > > 2023-04-15 Eli Zaretskii > > 2023-04-15 Po Lu > > > > in ChangeLog.4. Would someone please look into this? > > Some kind of gitmerge snafu, it seems. I figured out the reason: it's my fault. I have in my ~/.gitconfig [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/local/bin/git-merge-changelog %O %A %B So this is the result of using git-merge-changelog, which is not TRT when merging ChangeLog.4 from the release branch to master. Sorry.