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: master e714b31 3/6: Merge from origin/emacs-28 Date: Wed, 10 Nov 2021 20:46:20 +0200 Message-ID: <83fss33l37.fsf@gnu.org> References: <20211106092430.31690.17236@vcs0.savannah.gnu.org> <20211106092433.20A2420A22@vcs0.savannah.gnu.org> <87zgqcgg3n.fsf@gmail.com> <83k0hg2avf.fsf@gnu.org> <87sfw4gca1.fsf@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="5430"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org To: Robert Pluim Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 10 19:48:28 2021 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 1mkse1-00013v-ER for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 19:48:25 +0100 Original-Received: from localhost ([::1]:49524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mksdz-0007Fm-JM for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 13:48:23 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:35864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mksc5-0005VM-4l for emacs-devel@gnu.org; Wed, 10 Nov 2021 13:46:25 -0500 Original-Received: from [2001:470:142:3::e] (port=46532 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mksc4-0000Cz-ST; Wed, 10 Nov 2021 13:46:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=Ry0aghKUByEnQrRw0yobg6QLZE5B1kviGF5ttvSRTX0=; b=mseEMSeWTohp/YETc8Ib I+uk82RpZFRT4+5vq2FzJzLYSugtr7tDlttYub64MYv5SLhzZKm78f386ebi2RWztvmM9VeTDvPp3 7zRVPCos826P1LicYawNmxeUn4dyqmbpvde2eZh81trInuQpdxsC5GLeRAeWRkjzBoQf5fcwry+0l jXmN5AN5gDZVVJ3t4dPtcmN743rbJotg9UwZ6NkDJreye9J3FBQmVmnxdmqt/YwPuKFeqd1GZRHC7 q3A521wKvBVStcs/FPCIKTtBSlb5qBFhp/CeCgoOt8/lhArd/B/A7qNomkykmq2ux0FYjnew5o2em 4z4teqfbJsIwlw==; Original-Received: from [87.69.77.57] (port=2810 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 1mksc4-0002w5-AW; Wed, 10 Nov 2021 13:46:24 -0500 In-Reply-To: <87sfw4gca1.fsf@gmail.com> (message from Robert Pluim on Wed, 10 Nov 2021 18:18:14 +0100) 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" Xref: news.gmane.io gmane.emacs.devel:279190 Archived-At: > From: Robert Pluim > Cc: emacs-devel@gnu.org > Date: Wed, 10 Nov 2021 18:18:14 +0100 > > Merging NEWS is easy to get wrong, especially with the '+++' '---' > markers (I got it wrong when fixing the merge, and was about to blame > Stefan for not documenting his changes 😼). We don't actually merge NEWS, see gitmerge.el. the way we do it, there can be no problems, ever. The problem in my case was that the code there relied on some feature of Patch that my version here doesn't have, so it failed. And, as many things in gitmerge, this failure was more or less silent, so as someone who did this for the first time, it was hard for me to understand that I was looking at a bug and not at something the code was intended to do.