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: Moving etc/NEWS around causing release branch merge to fail again Date: Thu, 08 Dec 2022 20:08:03 +0200 Message-ID: <83mt7x22gs.fsf@gnu.org> References: Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="26181"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Dec 08 19:09:02 2022 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 1p3LKP-0006aw-SV for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Dec 2022 19:09:01 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3LJf-0006Qn-OI; Thu, 08 Dec 2022 13:08:15 -0500 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 1p3LJd-0006PB-3T for emacs-devel@gnu.org; Thu, 08 Dec 2022 13:08:13 -0500 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 1p3LJc-000842-1a; Thu, 08 Dec 2022 13:08:12 -0500 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=f4g7L/jm++nBk5QL1litSS2ukIFsrH+hKbLH7be+I/g=; b=JcB3h37xnTom 3uKUbP+YhFBfiQzL30coMJr2bg71n5/eeiD87cyGTfAhxXR1nqyqauGuuqicCFoceRAeD8jh19Yda Ni99I7xMyNMPt5RyZyRlik5fzuIyV2fx7WM2KlKJxqa5qqhUXnu5DHgaqLEJyovRq1dy7GmIeDwtF h3jG8sYiEUjnXLz5cTlGdEpPLvpW6KA2j7sxu/fWKmtjRVtsPS8DKV66jFwWAOCFLm8lsyBIA7zIM 2so9oKFOAsendMGrdCDOQLQsykdQrgfIvheYMhHpbXmEHw7UhgPx9opDagofdhxRZ57kMimXZNIZL jDbTN2htquWcdUSl0THeBg==; 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 1p3LJb-000567-D5; Thu, 08 Dec 2022 13:08:11 -0500 In-Reply-To: (message from Stefan Kangas on Thu, 8 Dec 2022 07:49:48 -0800) 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:301055 Archived-At: > From: Stefan Kangas > Date: Thu, 8 Dec 2022 07:49:48 -0800 > > Merging the release branch is failing due to our practice of moving > etc/NEWS around again. Here's what I see: > > $ ./admin/automerge -r -n 1 -b -t -p > Resetting... > Pulling... > Merging... > merged ok > automerge: etc/NEWS has been modified > > I'll see if I can find the time and energy to investigate this today, > but otherwise it might be a couple of days until I'll merge emacs-29 to > master again. If anyone knows what's going on, please fix it or even > better tell me which steps to take. I did the merge. I don't use admin/automerge, I use admin/gitmerge.el in an interactive session. It asked me whether to try resolving conflicts in NEWS; I answered YES. Then it said it finished successfully. I compared NEWS.29 on master with NEWS on the release branch, and saw that the entry for external-completion-table was lost; so I added it manually to NEWS.29. Maybe the way gitmerge.el attempts to fix the conflicts in NEWS is unreliable, and we should always do that manually? OTOH, fixing such probl;ems with NEWS is easy: in case there are too many diffs, just copy NEWS from the branch to NEWS.29 on master, and commit that. Do we edit NEWS.29 on master, ever? If we do, we should refrain from doing that.