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: master e714b31 3/6: Merge from origin/emacs-28 Date: Wed, 10 Nov 2021 11:37:09 -0800 Message-ID: References: <20211106092430.31690.17236@vcs0.savannah.gnu.org> <20211106092433.20A2420A22@vcs0.savannah.gnu.org> <87zgqcgg3n.fsf@gmail.com> <83k0hg2avf.fsf@gnu.org> <83ee7n3l0m.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="0000000000001a878805d0745a7e" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="30621"; mail-complaints-to="usenet@ciao.gmane.io" Cc: rpluim@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 10 20:38:55 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 1mktQr-0007qF-Se for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 20:38:53 +0100 Original-Received: from localhost ([::1]:33710 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mktQq-0004Pg-Vb for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 14:38:52 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:45768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mktPH-0002oW-PJ for emacs-devel@gnu.org; Wed, 10 Nov 2021 14:37:15 -0500 Original-Received: from [2607:f8b0:4864:20::632] (port=38573 helo=mail-pl1-x632.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mktPD-0006nm-Ia; Wed, 10 Nov 2021 14:37:15 -0500 Original-Received: by mail-pl1-x632.google.com with SMTP id o14so3889827plg.5; Wed, 10 Nov 2021 11:37:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:in-reply-to:references:mime-version:date:message-id:subject:to :cc; bh=EUCD5oll0tugbk1GM13gp3b3qIxXheGFDMOtNahRAFI=; b=ps5mefFM0KsyhtDhaGVq6oRORIu5HAWMJz828PmIx/MhPC/owUtrR7yUIVQAosiw5R hrUMkFzGo50dQShAOWzdKVZgC6hoitZs0GN1gxnWewDroS1dYNNSE9mnGBWtEVC1MlHb 5ez/HT1D6UBLbpOoaMlC9CmXaOsutsk+xvQYD3gOn8+CVCUsHvXR+qKztAREceuoY7/O WGdKQgHLUcE7y0BC1gWltIsA2MOj3U0N5c+a4k14cS9mr7YDCu/Z9OpxgtBNZAEZKiKA 9yXi7QwM43TqZbq2lciFXyZ9K79FndDnok+KPkrsQV3+Aa+MFuo8P6tE+HkAW7nt2YLb D/wQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:in-reply-to:references:mime-version:date :message-id:subject:to:cc; bh=EUCD5oll0tugbk1GM13gp3b3qIxXheGFDMOtNahRAFI=; b=TXHOT5bJ0m1DyMxE964XmMXjOHY0KIONpC21m35XeQeKSlKyPf+9AC9VoUsOYhISN/ 8TM+9VXk+yLlciKG7+79frndgB+Ff4eZ1MgMfjD5xVImOUzhj395tKWY/T7UW3Rcbrih i+vbq/umd6X73iMDjb57JKOXMVkIq2GDwPasI3+7kEyMK2cXcghkbK9P5ZCir2DcrYWM cSHDwrCYww0Aq8jjbzjUg/xHZGFC7H2fa5tlla+C4TpqRz1Sndl8W/YbYksflC01P1lk Xe/NEWYzmP8qNrfncGbkyfQ6D3+fHGrFa73guNxTf4z+gHYnAPrdWx3NAh8lBF2We6tD fpPA== X-Gm-Message-State: AOAM531iU38CK90mOtvtVZIk4jr/RbglEmLkeFggP+Er/Ndmoh6sIpaA pI8Ap4X8v48R0dFKxfu7QIOg5hHtYWeWvm7/Sn4CxEzo X-Google-Smtp-Source: ABdhPJz2d1CUUPTAKe0FIrALscNYwNLAMIZ4rE9K4HMLQW+xNFt8/d3m/6xI6z6xsDTirEnjts/lWTmawW/4UgC0oLU= X-Received: by 2002:a17:90a:be10:: with SMTP id a16mr1483128pjs.133.1636573030018; Wed, 10 Nov 2021 11:37:10 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Wed, 10 Nov 2021 11:37:09 -0800 In-Reply-To: <83ee7n3l0m.fsf@gnu.org> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::632 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::632; envelope-from=stefankangas@gmail.com; helo=mail-pl1-x632.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 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, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no 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" Xref: news.gmane.io gmane.emacs.devel:279198 Archived-At: --0000000000001a878805d0745a7e Content-Type: text/plain; charset="UTF-8" Eli Zaretskii writes: >> https://lists.gnu.org/r/emacs-devel/2017-12/msg00340.html >> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=29366 > > I guess we read different discussions, then. I read the above. Which discussions are you reading? Let's count heads: Robert Pluim, Michael Albinus, Stefan Monnier, Stefan Kangas, Glenn Morris, Juri Linkov have AFAICT all come out in support of this change. Some more forcefully than others. I don't see anyone against the change. > How can a simple bug in gitmerge be a proof of anything (except that > bugs happen)? The existence of the special code for this in gitmerge is already proof that this is suboptimal. If it is buggy, that makes it worse of course. But even if there are no bugs in gitmerge.el, today or in the future, we still lose the ability to use "git blame" in etc/NEWS.NN for the previous release on master. And what's the upside? None, AFAICT. Instead of working against fundamental limitations in git, it is easy or even trivial to completely side-step the issue. AFAICT, the attached patch fixes this on GNU/Linux, but I think you would need to do more on operating systems without symlink support. (There is obviously also more stuff to do in gitmerge.el and the install step. I didn't bother for this quick proof-of-concept though.) --0000000000001a878805d0745a7e Content-Type: text/x-diff; charset="US-ASCII"; name="0001-Move-etc-NEWS-to-etc-NEWS.NN.patch" Content-Disposition: attachment; filename="0001-Move-etc-NEWS-to-etc-NEWS.NN.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: 7e82c691d3071678_0.1 RnJvbSA2NGY3ODc3ZDgwM2Q4YWI3ODcwNDY5NDM3YmQ2ODA5ZTY4MTQyZjQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBTdGVmYW4gS2FuZ2FzIDxzdGVmYW5AbWFyeGlzdC5zZT4KRGF0 ZTogV2VkLCAxMCBOb3YgMjAyMSAxODoxMTozNiArMDEwMApTdWJqZWN0OiBbUEFUQ0hdIE1vdmUg ZXRjL05FV1MgdG8gZXRjL05FV1MuTk4KCiogZXRjL05FV1M6IE1vdmUgZnJvbSBoZXJlLi4uCiog ZXRjL05FV1MuMjk6IC4uLnRvIGhlcmUuCiogLmdpdGlnbm9yZTogSWdub3JlIE5FV1MuCiogYXV0 b2dlbi5zaDogU3ltbGluayBldGMvTkVXUyB0byBldGMvTkVXUy5OTi4KKiBzcmMvY2FsbHByb2Mu YyAoaW5pdF9jYWxscHJvYyk6IFNlYXJjaCBmb3IgdGhlIGV0Yy8gZGlyZWN0b3J5IGJhc2VkCm9u IHRoZSAiVE9ETyIgZmlsZSBpbnN0ZWFkIG9mICJORVdTIi4KLS0tCiAuZ2l0aWdub3JlICAgICAg ICAgICAgfCAxICsKIGF1dG9nZW4uc2ggICAgICAgICAgICB8IDUgKysrKysKIGV0Yy97TkVXUyA9 PiBORVdTLjI5fSB8IDAKIHNyYy9jYWxscHJvYy5jICAgICAgICB8IDQgKystLQogNCBmaWxlcyBj aGFuZ2VkLCA4IGluc2VydGlvbnMoKyksIDIgZGVsZXRpb25zKC0pCiByZW5hbWUgZXRjL3tORVdT ID0+IE5FV1MuMjl9ICgxMDAlKQoKZGlmZiAtLWdpdCBhLy5naXRpZ25vcmUgYi8uZ2l0aWdub3Jl CmluZGV4IGVhMTY2MmM5YjguLmMyMTIzNDBkYTUgMTAwNjQ0Ci0tLSBhLy5naXRpZ25vcmUKKysr IGIvLmdpdGlnbm9yZQpAQCAtMjY0LDYgKzI2NCw3IEBAIGRvYy9taXNjL2NjLW1vZGUuc3MKIGRv Yy9taXNjL21vZHVzLXRoZW1lcy50ZXhpCiBkb2MvbWlzYy9vcmcudGV4aQogZXRjL0RPQworZXRj L05FV1MKIGV0Yy9yZWZjYXJkcy9lbWFjc3Zlci50ZXgKIGdudXN0bXAqCiAvaW5mby8KZGlmZiAt LWdpdCBhL2F1dG9nZW4uc2ggYi9hdXRvZ2VuLnNoCmluZGV4IDUzMWU1Nzc1ZjkuLjExMTJmYWRk NjMgMTAwNzU1Ci0tLSBhL2F1dG9nZW4uc2gKKysrIGIvYXV0b2dlbi5zaApAQCAtMTQwLDYgKzE0 MCwxMSBAQCBkb19naXQ9CiAgICAgdGVzdCAtciAuZ2l0ICYmIGRvX2dpdD10cnVlOzsKIGVzYWMK IAorIyBTeW1saW5rIE5FV1MKK2lmIFsgISAtZSBldGMvTkVXUyBdOyB0aGVuCisgICAgbG4gLXMg IiQobHMgLTEgZXRjL05FV1MuKiB8IHRhaWwgLTEpIiBldGMvTkVXUworZmkKKwogIyBHZW5lcmF0 ZSBBdXRvY29uZi1yZWxhdGVkIGZpbGVzLCBpZiByZXF1ZXN0ZWQuCiAKIGlmICRkb19hdXRvY29u ZjsgdGhlbgpkaWZmIC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMvTkVXUy4yOQpzaW1pbGFyaXR5IGlu ZGV4IDEwMCUKcmVuYW1lIGZyb20gZXRjL05FV1MKcmVuYW1lIHRvIGV0Yy9ORVdTLjI5CmRpZmYg LS1naXQgYS9zcmMvY2FsbHByb2MuYyBiL3NyYy9jYWxscHJvYy5jCmluZGV4IGZhNDNmOTczODQu LmYwMzU0MzIwZjcgMTAwNjQ0Ci0tLSBhL3NyYy9jYWxscHJvYy5jCisrKyBiL3NyYy9jYWxscHJv Yy5jCkBAIC0xNzMzLDEzICsxNzMzLDEzIEBAIGluaXRfY2FsbHByb2MgKHZvaWQpCiAKICAgICAg IHNyY2RpciA9IEZleHBhbmRfZmlsZV9uYW1lIChidWlsZF9zdHJpbmcgKCIuLi9zcmMvIiksIGxp c3BkaXIpOwogCi0gICAgICB0ZW0gPSBGZXhwYW5kX2ZpbGVfbmFtZSAoYnVpbGRfc3RyaW5nICgi TkVXUyIpLCBWZGF0YV9kaXJlY3RvcnkpOworICAgICAgdGVtID0gRmV4cGFuZF9maWxlX25hbWUg KGJ1aWxkX3N0cmluZyAoIlRPRE8iKSwgVmRhdGFfZGlyZWN0b3J5KTsKICAgICAgIGlmICghTklM UCAoRmVxdWFsIChzcmNkaXIsIFZpbnZvY2F0aW9uX2RpcmVjdG9yeSkpCiAJICB8fCBOSUxQIChG ZmlsZV9leGlzdHNfcCAodGVtKSkgfHwgIU5JTFAgKFZpbnN0YWxsYXRpb25fZGlyZWN0b3J5KSkK IAl7CiAJICBMaXNwX09iamVjdCBuZXdkaXI7CiAJICBuZXdkaXIgPSBGZXhwYW5kX2ZpbGVfbmFt ZSAoYnVpbGRfc3RyaW5nICgiLi4vZXRjLyIpLCBsaXNwZGlyKTsKLQkgIHRlbSA9IEZleHBhbmRf ZmlsZV9uYW1lIChidWlsZF9zdHJpbmcgKCJORVdTIiksIG5ld2Rpcik7CisJICB0ZW0gPSBGZXhw YW5kX2ZpbGVfbmFtZSAoYnVpbGRfc3RyaW5nICgiVE9ETyIpLCBuZXdkaXIpOwogCSAgaWYgKCFO SUxQIChGZmlsZV9leGlzdHNfcCAodGVtKSkpCiAJICAgIFZkYXRhX2RpcmVjdG9yeSA9IG5ld2Rp cjsKIAl9Ci0tIAoyLjMwLjIKCg== --0000000000001a878805d0745a7e--