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 12:09:44 -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> <838rxv3iqs.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="36883"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Glenn Morris , 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 21:11:08 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 1mktw3-0009Qm-Qi for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 21:11:07 +0100 Original-Received: from localhost ([::1]:48644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mktw2-0008Ef-7z for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 15:11:06 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:51322) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mktun-0007QB-3v for emacs-devel@gnu.org; Wed, 10 Nov 2021 15:09:49 -0500 Original-Received: from [2607:f8b0:4864:20::1033] (port=38422 helo=mail-pj1-x1033.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mktul-0002W9-BN; Wed, 10 Nov 2021 15:09:48 -0500 Original-Received: by mail-pj1-x1033.google.com with SMTP id p18-20020a17090ad31200b001a78bb52876so2609774pju.3; Wed, 10 Nov 2021 12:09:46 -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=9yietvLoFxb4fdZMKbYJK+5piffMd6ySWTywiX+/q8M=; b=QVAEmSXu/Dkc/7pg/BWSuYayrYkO8eaV8qsUz8VO38mJrTNLQe+40BXarrcpLzL3s+ yKFqDDl3l+EiiAN+19uU8izoYanzfLgdpznxEcxKZt0EE/QMQAT5NtGo16TwMtURJj3p eKKdXnM9hBbdMLRd8V0uDzKhLGIgjtEYRhBGuDSAwjioP/CN4m/N48sOLtKR6/ABSuAk lp+jJUS1kMRewQKJ50xifNPOTv8tsCqX7hnxcuWaqeLuhBGu62rA2IqIOOq6O3ro8n6b pTsR+NwlFS4NJFymrt8n4Rj4/7iD7wVX9PpLZNhJJPfAUiwwLM1t7RaKzF+XoXJ20N4a TuWw== 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=9yietvLoFxb4fdZMKbYJK+5piffMd6ySWTywiX+/q8M=; b=u9pI+LGAruhGNwrkn340/bPAwNcJCwZ0ilcRtwiAz1uORORB4M0PWuF3rH+AG2tJuS MBbLw5xhgtjZw3ruRLYXZUPwddG+iKbkfER6cPbaNAlW1lZFNTYehQ5ETacgbYGMP4++ G/bnkXQmwaauo1Bl+l3Uuqq9g8e5tVZp36JK4UHk2e0TdAnGsmfcRjT9H7PKbSZB203q 8K3WLRWm4QyHSZQy2OgyPbljhxiEnsszWVUfz24h841SndZmwYJTVHk4LqdEmZA8EFnt uxF/lp43Ujmk3+wd2TllkuVN5PIm6UGte8VyYNASEUR4FoHpJl6DaxcTICNzZrI8ThM5 R1aw== X-Gm-Message-State: AOAM533hG9K+4EdqOYxs0yo45T7I+BkFwBFO1VBfhhluWCD6GFIeOS09 NmTbdXVb7NCpuHyfimCSRRPpuukMUnVVpjJE5TvmkEkz X-Google-Smtp-Source: ABdhPJwJNnM1xmkQ5BqiVWl5kRC5AY6ngAZBQ1lsfJvilcCEF7WOgYEIQk8OktxHTJXZPOQUmGZNxWPaAMS0Nhblmrg= X-Received: by 2002:a17:90b:1e0e:: with SMTP id pg14mr19764336pjb.143.1636574985178; Wed, 10 Nov 2021 12:09:45 -0800 (PST) Original-Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Wed, 10 Nov 2021 12:09:44 -0800 In-Reply-To: <838rxv3iqs.fsf@gnu.org> X-Host-Lookup-Failed: Reverse DNS lookup failed for 2607:f8b0:4864:20::1033 (failed) Received-SPF: pass client-ip=2607:f8b0:4864:20::1033; envelope-from=stefankangas@gmail.com; helo=mail-pj1-x1033.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:279200 Archived-At: Eli Zaretskii writes: > Look closer, please. It is up to you to produce evidence for your claims, or they will remain unsubstantiated. You claimed in the past that we can solve this and make everyone happy: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20403#33 Nothing has changed since then, besides your newly discovered opposition to these changes. >> 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. > > Nonsense. It just means we haven't yet got the full solution for > that. The better choice is to just not to create problems for ourselves in the first place. >> 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. > > "git annotate" on NEWS is pretty meaningless anyway. Stuff gets moved > there too much for that to be useful. Some posters on this mailing list *do* use it (me included): "I use VC archeology on NEWS all the time. It is handy when I need to know who and when added some new feature." https://lists.gnu.org/archive/html/emacs-devel/2021-09/msg00534.html >> And what's the upside? None, AFAICT. > > You are biased, so you only see the side that suits you. That is just a run-of-the-mill ad-hominem. If you disagree, feel free to present substantial arguments instead. I see no serious arguments so far, yet you claim to be the one that is "unbiased". > The upside is that we are using this for a long time, and any problems > we see now are minor. We have also had issues with it for a long time. I have already provided the evidence to back that claim up, but here's some more: "At present, emacs26:etc/NEWS has to get merged to master:etc/NEWS.26. This is a PITA at every single merge. "If the file was already called NEWS.26 on both branches, all these merge problems would go away." https://debbugs.gnu.org/cgi/bugreport.cgi?bug=20403#30