From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Kangas Newsgroups: gmane.emacs.devel Subject: Re: Moving etc/NEWS around causing release branch merge to fail again Date: Thu, 8 Dec 2022 14:20:19 -0800 Message-ID: References: <83mt7x22gs.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15443"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Thu Dec 08 23:20:41 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 1p3PFw-0003qk-1i for ged-emacs-devel@m.gmane-mx.org; Thu, 08 Dec 2022 23:20:40 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3PFg-0007lR-8t; Thu, 08 Dec 2022 17:20:24 -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 1p3PFf-0007lF-3b for emacs-devel@gnu.org; Thu, 08 Dec 2022 17:20:23 -0500 Original-Received: from mail-ot1-x334.google.com ([2607:f8b0:4864:20::334]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3PFd-0004Nu-Fr; Thu, 08 Dec 2022 17:20:22 -0500 Original-Received: by mail-ot1-x334.google.com with SMTP id m7-20020a9d6447000000b0066da0504b5eso1712218otl.13; Thu, 08 Dec 2022 14:20:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:from:to:cc:subject:date:message-id:reply-to; bh=s0aaRiss/AtX+f2bDDh3QFqk+N+pqLNDjNrzeYE6BTU=; b=oAkykYaj6+Z0Kt/s3enHaBmztajoVwyaIJ5ZPEIqJA1Yulv0TN/lOrcdgYNKCto68g XdEZUxITH2hvp8ptcAXIgB4qR8H4i4SnPKCbbcXoVGUQoA1BUyJtMqL3jh0N8dD2Car1 AGV5U+TrFaAPlXWiZtdOiBlQyMkoWmMN0SsQ6UUKnW3Q1GlO2ngNp1lai0Yi8vc8S5QZ ujGoCNsb2Vxdh+BxbP9VyElnQYAVxkRsHh1sPo+wCMLy6HsOcLU2lneHmUOfeNnZndAS mZPEAuwbsov3BRezWj0DBuupaGoS0H3T/es/IOwy2LV3EW5MGpyVQrWF/Dy9tohQ5UCz h/KQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:subject:message-id:date:mime-version:references:in-reply-to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=s0aaRiss/AtX+f2bDDh3QFqk+N+pqLNDjNrzeYE6BTU=; b=F2GNQkivvW2xUtRCvZeL/IPu9gkJ92V2EEE3YZr9rb3Bm3lopmXog/FinXdgQ0/aWL +Xhl1i+aTdeTx8MbB53BldqDX39RWodbIn/lAhc3/+OqIbMcYQye9MwPreNklFgVd7o8 fxXTw26JFTtLNR875K3B3gOJMkxtSB9g4WQoRk8yR2kkQPKUChUvleZ0enPSbbUENVwE I599aUXoLo390PiROfcqeGH54aMWerq71jhHmIHI0xJ5ItPCiIPrn65dQFeQx9fRI87/ c7MfR5RMNUnB0QpJeFnrKlybvHpp188kzI1SPsQcgkQz7NlO2Y/mh3NxeleX2KGkWRSv tAcg== X-Gm-Message-State: ANoB5plL9WgmRWaXgAUMsfVgJHu3qOpy+c3X2N1nfgHgmLxqHnKNYAIg cWv/EaQgCNhhZ9lwXoWLZbAmV49MYubk6ClMAXvYsFyM X-Google-Smtp-Source: AA0mqf4jK2POhwJJO68f5FaRgGaMMl1XDgx9C8+s8vJNx+K2Y+ank+5CeQ7BgpXV0+dIiiqT7V8sbEzIga06qcIPz0I= X-Received: by 2002:a9d:6203:0:b0:66e:f6cb:cb4e with SMTP id g3-20020a9d6203000000b0066ef6cbcb4emr7493271otj.105.1670538019833; Thu, 08 Dec 2022 14:20:19 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Thu, 8 Dec 2022 14:20:19 -0800 In-Reply-To: <83mt7x22gs.fsf@gnu.org> X-Hashcash: 1:20:221208:emacs-devel@gnu.org::LZ2jJsMdQKRuciTq:yZV Received-SPF: pass client-ip=2607:f8b0:4864:20::334; envelope-from=stefankangas@gmail.com; helo=mail-ot1-x334.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:301059 Archived-At: 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. > Maybe the way gitmerge.el attempts to fix the conflicts in NEWS is > unreliable, and we should always do that manually? I think it mostly either works, or it is clear how to fix it. But it was the first time I saw this particular error. > 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. Yup. Perhaps we could even make automerge detect that, and do it for us if needed (or at least let us know). I'll put it on my TODO. > Do we edit NEWS.29 on master, ever? If we do, we should refrain from > doing that. I've had to backport NEWS.28 changes from master to emacs-28 on at least one occasion. It is indeed better to avoid that.