From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: master e714b31 3/6: Merge from origin/emacs-28 Date: Wed, 10 Nov 2021 22:50:15 +0300 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; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="27005"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.13.0 Cc: rpluim@gmail.com, emacs-devel@gnu.org To: Eli Zaretskii , Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Wed Nov 10 20:53:26 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 1mktew-0006rv-MT for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 20:53:26 +0100 Original-Received: from localhost ([::1]:46106 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mktev-0004qx-EL for ged-emacs-devel@m.gmane-mx.org; Wed, 10 Nov 2021 14:53:25 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:48022) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mktc2-0002nT-Jw for emacs-devel@gnu.org; Wed, 10 Nov 2021 14:50:26 -0500 Original-Received: from [2a00:1450:4864:20::134] (port=34631 helo=mail-lf1-x134.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mktc0-0000PB-LC; Wed, 10 Nov 2021 14:50:26 -0500 Original-Received: by mail-lf1-x134.google.com with SMTP id u11so8695139lfs.1; Wed, 10 Nov 2021 11:50:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=qDISkBkoAZtR8sh01gGod7pLoBFIVmJyO189uewWJ+0=; b=h5UkiBSfi40g2BiPd/17/6KASSEprReT8u9N0hUTjYEj0lfwUMvQcNv+tlXBn5R1si iMFFbcLUn8SuejGwNoaoiI7diSL4lbG9qki0TqHqXNo6zmclCkGlOBKAY5uUzhWi9tGp B1ZWvbXGpUoD/DHjSj+zOa76BxR7jBq1JX70a/+rh3vBGEdtxqbdmfNrjceJ11+2xdOj bRYEUldwi4vw4ZPktz8pMSPRpYCn7G87HtFmImCeb0QtMt92/ZCblwJc2a8DOuXu2KP1 rq+z7k/s+bLVQv+gVXMO7O8uhTRmq17DG7c3LymH+0oztlDeqaGM5/BtdJ15hggESpbc jUqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=qDISkBkoAZtR8sh01gGod7pLoBFIVmJyO189uewWJ+0=; b=Yba/ojin7fcyJp/bZVq2VvYB9aPwADo8MWdAp0dkUI+VRbNg/g2TRLT43pPuL3bfBz K20QESy7836vJQFItMtWTBPQRkmp73iqpYRFfNXiJDX4p+XMdGr56Q56XVXpYQsxyY2C +UJ1Lz4B1uQFfT9qoMaKB0+O8kcYGuzlyMyQf5aEF+DoWB4SFlPXfknldhlUjxZ8Ox8v nCEuuEiBQymajyrwkQEtnIGpVgBxVhKH5oRXB2TM2NFa09m/q4EusIvSN2AK8sa/Ou1l yeGvsoLGCls/THSIKr6ObF9r3AaLvdOl60QUlNXVjJq1vzqATjlMv9NkE5b2baVmTeS1 DD3g== X-Gm-Message-State: AOAM530UQoB30lNMW1kP3U7zJaAtD71SzAhhSd4ZG8YVWnCHYGjmmT8E 4ryPgCWm5w91mfsL8P54lIlqMBQYj5U8bw== X-Google-Smtp-Source: ABdhPJzMwNdnZGsfsHDt+x+zAJJu4W05wl/OczVedwaKvbQTwlcoPrpCUKdUV/qpb66aZQQGHedv8A== X-Received: by 2002:ac2:5ca8:: with SMTP id e8mr1495830lfq.391.1636573822405; Wed, 10 Nov 2021 11:50:22 -0800 (PST) Original-Received: from [192.168.0.103] ([5.18.235.131]) by smtp.googlemail.com with ESMTPSA id v198sm78176lfa.89.2021.11.10.11.50.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 10 Nov 2021 11:50:21 -0800 (PST) In-Reply-To: <838rxv3iqs.fsf@gnu.org> Content-Language: en-US X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::134 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::134; envelope-from=raaahh@gmail.com; helo=mail-lf1-x134.google.com X-Spam_score_int: -23 X-Spam_score: -2.4 X-Spam_bar: -- X-Spam_report: (-2.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.249, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, NICE_REPLY_A=-1.678, 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=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" Xref: news.gmane.io gmane.emacs.devel:279199 Archived-At: On 10.11.2021 22:36, Eli Zaretskii wrote: >> 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. I use that, from time to time. For stuff that was moved (which happens, sure), we have 'vc-annotate-revision-previous-to-line'.