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: Tue, 13 Dec 2022 21:32:41 -0800 Message-ID: References: <83mt7x22gs.fsf@gnu.org> <83fsdiodld.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="40363"; 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 Wed Dec 14 06:33:48 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 1p5KOq-000AJo-C2 for ged-emacs-devel@m.gmane-mx.org; Wed, 14 Dec 2022 06:33:48 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5KNu-0003lG-Ny; Wed, 14 Dec 2022 00:32:50 -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 1p5KNq-0003kl-A3 for emacs-devel@gnu.org; Wed, 14 Dec 2022 00:32:47 -0500 Original-Received: from mail-oa1-x2a.google.com ([2001:4860:4864:20::2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5KNn-0003a1-Ux; Wed, 14 Dec 2022 00:32:45 -0500 Original-Received: by mail-oa1-x2a.google.com with SMTP id 586e51a60fabf-1442977d77dso15355363fac.6; Tue, 13 Dec 2022 21:32:43 -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=rwKhrwypLMkggr/A3UsFzsoRDWugibgoXIT0V58NN8I=; b=RvoYql3YaqBM12oKfGzmrnlvVunmjujLkCM4fm/qjSzaq/b9FyA9IR5IzmEyuO3OgM ZO/pWgTNBA60SOYE3bgB3PLP8ad3rJQc8hGW+iyJ9KWdXcSZdnBe242oUrzKauucY5U5 TWkAz3gNa0R4jdx8/GsQy49/iqh3bMq6mXszuuxM5Gv4DILEc+8bDIenVMTN/RBtYGll 9d4iUbA/O964EtdG/un4r+QPqqfDMLdhe2iOD2tYknYyln/YVvjTTFt96iLllKoDfcGp 1XX26ln7EN4xSWieQZXiFOEPkqQlHNlsPdG3P+/DQ4dByu4aDbPit4kgeD2/+qsGQD+O JKXg== 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=rwKhrwypLMkggr/A3UsFzsoRDWugibgoXIT0V58NN8I=; b=5VN8tKDDs1l4PMNL4gZR7mHyjR5ZovcNwBwuD9swDVxwDMihDKaQDXh8w338HU0iYI rm5ykb4ikbKsCANLQ/dnWidbZF0UfqhVyx9TMujJTFiTiPDE1U0/FfOYtTi3yayZYdDJ pOng0zOMaisQPsr96HqFv9cHjblSfACiTaNmUd8i5ns5EYV2NHIKHXi4gW45v7yQT3oa QMaWqsndsGD5fjqS4IGue+enrU/JJ1iROrRnX+pkdaeB56tGK5NqBgU53F8cwqdP/+N3 jfDiIjSzLYwv9MT6w+7hEkE8LRzHgI3qv8zW0+E5divnlFID6VDDbUpJd+XWejH2+ITd dYMw== X-Gm-Message-State: AFqh2krf4O3MVJbIED99ipjv41q7ntZqX0RlzXhfIex39KOBuVtNkL7J 1ePqwd7ie1odNhqA+r9A0rd/njxjLkppGUxcf7mpW3Xa X-Google-Smtp-Source: AMrXdXuyWl4AfhfGvTyrvyPTdA8jplVH10ElrO+/xNTTTabmd1+wOcoRohQgDEgqeUR4u2nW6X5TK6meT07g5q79Tx0= X-Received: by 2002:a05:6870:311:b0:145:3a7:99c with SMTP id m17-20020a056870031100b0014503a7099cmr93379oaf.92.1670995962158; Tue, 13 Dec 2022 21:32:42 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 13 Dec 2022 21:32:41 -0800 In-Reply-To: <83fsdiodld.fsf@gnu.org> X-Hashcash: 1:20:221214:eliz@gnu.org::F544FWQcIriH/5Yn:Tmr Received-SPF: pass client-ip=2001:4860:4864:20::2a; envelope-from=stefankangas@gmail.com; helo=mail-oa1-x2a.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:301369 Archived-At: Eli Zaretskii writes: > What happened, exactly? Please tell more about what you saw. I saw the automatic merge fail with this error message: etc/NEWS has been modified > Did you succeed in understanding the reason(s)? For some reason, git succeeds in merging NEWS without any conflicts, and then admin/automerge croaks because of it (see below). Perhaps it is related to the merge errors fixed in f1840cf12fda7f? I don't know. If it happens again, I hope to understand more about what is going on. Should anyone want to dig in, just say this on master: git reset --hard 8036739c1bb6fa^ # warning: hard reset ./admin/automerge -r -n1 Fix the conflicts in typescript-ts-mode.el and lisp/treesit.el, and then: ./admin/automerge -n1 >> 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"? When I say manual merges, I mean those carried out using something like: emacs -Q -l admin/gitmerge.el -eval '(gitmerge "emacs-29")' After a merge from the release branch (emacs-NN) to master, the etc/NEWS file should never be modified. Only the etc/NEWS.NN file should have been modified. Otherwise, it needs to be fixed manually. See also these lines in admin/automerge: ## FIXME it would be better to trap this in gitmerge. ## NEWS should never be modified, only eg NEWS.26. git diff --stat --cached origin/master | grep -q "etc/NEWS " && \ die "etc/NEWS has been modified"