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 15:34:09 -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="13268"; 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 00:35:04 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 1p5Enf-0003FH-RR for ged-emacs-devel@m.gmane-mx.org; Wed, 14 Dec 2022 00:35:03 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p5Emu-0002YW-O1; Tue, 13 Dec 2022 18:34:16 -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 1p5Emt-0002Y8-Bo for emacs-devel@gnu.org; Tue, 13 Dec 2022 18:34:15 -0500 Original-Received: from mail-oa1-x32.google.com ([2001:4860:4864:20::32]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p5Emq-0005Cu-Qp; Tue, 13 Dec 2022 18:34:14 -0500 Original-Received: by mail-oa1-x32.google.com with SMTP id 586e51a60fabf-1443a16b71cso14521584fac.13; Tue, 13 Dec 2022 15:34:10 -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=AlvzqIxy0f8DnlMI0zQ71sUNkyaIEFikwPUIwMZ8Dxc=; b=Bzr4N4hqpb/V/aJlxmHywcKVpT1+HY+z1yvUilXS3BF64BXJ4RAVYjpAmTe8bbH/vo SFvU5pXEV9d5qZqbwAm+NxX00MnoF7DCKkyuiy9ony8AjYJylz1+MTOSWLee4x6Cg00k CdtBEcyOaMVXgV6maS/frxq2hK39cW7a8giBfOXifr7WSS0TqOtbPZqF5L19FOfiBkUa owmEZgrDlNn5dcQqbKL2GdbNvgE6T6PBkzLoN4cW7PxP0HJV9gcWbaRBD0pvIhBr7nP9 IM72yHzBNZOLts6b6z1/Axn28uE5LgDBZ8CLxRUoKJm3hNBR1tF6cTbVUisQkrjQ6Qmi nwqA== 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=AlvzqIxy0f8DnlMI0zQ71sUNkyaIEFikwPUIwMZ8Dxc=; b=BMbUBTF48B6Tplj+J6rkKdh9mtVRrO8O0moX4+Zmlzuh+UT6yDTWUyjdowpl3dylGe ABeRm8l6vQW4Ym0AMo/7SM2oa4/qxLEneHT0EkK+xEK9fPy9XeLcDYYyvR0Uwd+ix1AZ 1WjbRss/o4tOqoXHlk0PEDX1BC7aqTYMjXy0YP/pEmDyBIvEfOoNEQi8KUQEeXSrjZ7R F/7eNPobeE/PQpckRKXFwWcJxJPS4PjahnwtELCfNoyFlsfHma55xJX3F+NwH6n0uGz/ T+p7hshOLut2fo+VfsSOR9Tzactgchul7pUKJHb2gxzOm+GuaGKZkp5CEKx2jstOU15r 5DKg== X-Gm-Message-State: AFqh2kq9OPQe9idVNbooDG2W8p+tCxricQOxn6QQM+c4mbVa6DcLkuXF aRo1DtDxZHkprJzDjgSfkrXvLwKlIqAXaBQ1w1ZXhx4K X-Google-Smtp-Source: AMrXdXt8eDXoqZgCiVVBGOd605bJeF60Wh+OLqS1qdNHEY/+QVp3K6CDBSZ7iB2vv+1yyqWuaxzvAAIRx+N3+JTk3xI= X-Received: by 2002:a05:6870:3853:b0:148:28c1:3d46 with SMTP id z19-20020a056870385300b0014828c13d46mr37023oal.199.1670974449972; Tue, 13 Dec 2022 15:34:09 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Tue, 13 Dec 2022 15:34:09 -0800 In-Reply-To: X-Hashcash: 1:20:221213:eliz@gnu.org::+q8y+bkG2IAfpo+Q:6AEv Received-SPF: pass client-ip=2001:4860:4864:20::32; envelope-from=stefankangas@gmail.com; helo=mail-oa1-x32.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:301366 Archived-At: 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. 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. BTW, when doing manual merges, can everyone please try to make sure that etc/NEWS is *not* modified, or fix it manually. Merges with `M-x gitmerge' are prone to such errors, as there are no automatic checks in place for modifying NEWS, in the case where there are no git merge conflicts. See the FIXME in admin/gitmerge.el. (Such a mistake was made in commit 6d6ca47aba7b, where the NEWS entry added in 8f49137c9bf was merged into the etc/NEWS file on master. I've fixed that in commit f1840cf12fda.)