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: Wed, 14 Dec 2022 05:42:38 +0200 Message-ID: <83fsdiodld.fsf@gnu.org> References: <83mt7x22gs.fsf@gnu.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11740"; 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 Wed Dec 14 04:43:28 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 1p5Ig3-0002w8-Bj for ged-emacs-devel@m.gmane-mx.org; Wed, 14 Dec 2022 04:43:27 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5IfD-0005EW-0B; Tue, 13 Dec 2022 22:42:35 -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 1p5IfA-0005EN-6q for emacs-devel@gnu.org; Tue, 13 Dec 2022 22:42:32 -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 1p5If9-0006of-Uq; Tue, 13 Dec 2022 22:42:31 -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=o9ZC+q+gP0X9thHj3fAVq3a/2xY4Pt+cWGT6LUpohoE=; b=Eg9wdamcFISx 8DybQI5qogY03Y9G01BLt8pnSKCHoW4Sydf25iMMfpY0ofs7kCno4RsyKPZ8uF5MAH9jovXgf7J6x TQ/mM3POXEJcJ+Bmj/yapuRgk6jkLFmPyMSnTJ2V1kkICFETA+DllRTrSUR4QyQbqrkQdppFN4vYM gpctCRLMAP7BeWsbpHbrFclpG7JAKi7856+0oa6s9SvQ8nRbN+dMupQpk3YNsCvZgT9LJs2nIMM6v lfyWpvVoLJCxGG3ZFJTi8xR6ke3nIEllnlcFCP5bCJLKg/RwsGktdR2Kv1tVtVxk9ROtx2DAN6fc0 MBgHjuNFWuRMFR3q1tIcgw==; 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 1p5If9-0004SP-9e; Tue, 13 Dec 2022 22:42:31 -0500 In-Reply-To: (message from Stefan Kangas on Tue, 13 Dec 2022 15:34:09 -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:301368 Archived-At: > From: Stefan Kangas > Date: Tue, 13 Dec 2022 15:34:09 -0800 > Cc: emacs-devel@gnu.org > > Stefan Kangas writes: > > > Eli Zaretskii writes: > > > >> 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. > > > > Thanks, I'll try a manual merge next time. > > It happened again. What happened, exactly? Please tell more about what you saw. > I spent an hour trying to fix the merge this time, > and doing it manually with `M-x gitmerge' got me nowhere. NEWS was > still being modified, and it didn't prompt me about NEWS. I ended up > just fixing up NEWS manually after the merge, which is what I'll do from > here on out. Did you succeed in understanding the reason(s)? > BTW, when doing manual merges, can everyone please try to make sure that > etc/NEWS is *not* modified, or fix it manually. You mean, the merge to NEWS.29 on master? Which NEWS should not be modified, and what do you mean by "manual merges"?