From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Yuan Fu Newsgroups: gmane.emacs.devel Subject: Re: Moving etc/NEWS around causing release branch merge to fail again Date: Sat, 31 Dec 2022 14:42:35 -0800 Message-ID: <2955FDDC-828C-4EC7-A250-FB7E67850DA5@gmail.com> References: <83mt7x22gs.fsf@gnu.org> Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="15290"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Sat Dec 31 23:43:36 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 1pBkZk-0003tE-BS for ged-emacs-devel@m.gmane-mx.org; Sat, 31 Dec 2022 23:43:36 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBkYt-00047x-E5; Sat, 31 Dec 2022 17:42:43 -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 1pBkYq-00047R-OW for emacs-devel@gnu.org; Sat, 31 Dec 2022 17:42:40 -0500 Original-Received: from mail-pl1-x62c.google.com ([2607:f8b0:4864:20::62c]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBkYp-0005eC-74; Sat, 31 Dec 2022 17:42:40 -0500 Original-Received: by mail-pl1-x62c.google.com with SMTP id p24so2983759plw.11; Sat, 31 Dec 2022 14:42:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=YaZtU5VWzZ9SwQfRD2ySTcvSqnJwbZ9Eb03B/MU97FM=; b=YOHkx60+Tk41Or7bEaP84ykmlErJxPE4h/O7Jjae00/ekWh5t2V8N2xDrtkq6XzhzE WUoDb8xBp5L46jnCcZT9AiNP0LJs8/IIMqIBGdGgrpbvyPadSJkoS7qS2J01DVHsjEp7 FdGy5tGC47ueIh87MqgCa8KcfuR5vCucugjP49nwGidFg0CeUzgcFWQdrMwicKrM+lp+ vkHHdlMvgw4+g3uTqYXwXB0ySS5s2yR43VM86um92vSOkhS6W8Hpnp36KkJ7g2zUOzjx JChx4vdOo5csyPrL8P55UL+anNFi9oO2wwdHmliNBcDXFlPN+dMdlUip35cPTonbGuOr JLXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YaZtU5VWzZ9SwQfRD2ySTcvSqnJwbZ9Eb03B/MU97FM=; b=no2pLg34WL9kmIjV+MvOr0/Okwzyp1/vfp0+MF8BoYMGdEPuTznnrb/Ihl0qnZnsZZ YGLJlYp1R2l++OHh3Jh8oTgXtXhQ+v0JdF5J43hUxIrB7BAFKAlw1G+OB4ZyIb7MXiPY OizancjtCXGg7Td09u0ADwWvBZmeCfk6N7il6h+jJcIhfDTmt/DmvQ9VPvg1DRoPm939 Djd9Fv3FIWAZENXSlhGNtl5JOV4C6ceFLsSIQ7U+JQNcRSCZcEKJdUpue1TPuVPl+T/h QMHl0r1gwJeoNyfGl+9ufm0caNdxDuH8nyUuyZ5y/jy7QmnOozq/G9mtovaMBoEneN8s PzUw== X-Gm-Message-State: AFqh2kpxkt9k/wZHTX1p/0+DRN1Ly3GPUA/XScZpZNMy3lNNKWRws6n+ d8D7hVsGGgvm2hS86R63elU= X-Google-Smtp-Source: AMrXdXuEMblvrPumr+i8C+XU8/fVbihnrFrIGx9gCs/3kEjdqkGou/b0U7UrBwF2JGcQM9Oz4HYKWQ== X-Received: by 2002:a17:902:904b:b0:186:95c9:ddc9 with SMTP id w11-20020a170902904b00b0018695c9ddc9mr45720997plz.55.1672526556979; Sat, 31 Dec 2022 14:42:36 -0800 (PST) Original-Received: from smtpclient.apple (cpe-172-117-161-177.socal.res.rr.com. [172.117.161.177]) by smtp.gmail.com with ESMTPSA id a3-20020a170902710300b0017f7628cbddsm17301702pll.30.2022.12.31.14.42.35 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sat, 31 Dec 2022 14:42:36 -0800 (PST) In-Reply-To: X-Mailer: Apple Mail (2.3696.120.41.1.1) Received-SPF: pass client-ip=2607:f8b0:4864:20::62c; envelope-from=casouri@gmail.com; helo=mail-pl1-x62c.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:302162 Archived-At: > On Dec 13, 2022, at 3:34 PM, Stefan Kangas = wrote: >=20 > Stefan Kangas writes: >=20 >> Eli Zaretskii writes: >>=20 >>> 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. >>=20 >> Thanks, I'll try a manual merge next time. >=20 > 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. >=20 > 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. >=20 > (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.) Do I need to do anything special when editing the NEWS file on emacs-29? = Doesn=E2=80=99t seem like it but just want make sure. Yuan=