From unknown Tue Aug 19 23:12:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 29 Aug 2021 21:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 50258 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 50258@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.163027133321967 (code B ref -1); Sun, 29 Aug 2021 21:09:02 +0000 Received: (at submit) by debbugs.gnu.org; 29 Aug 2021 21:08:53 +0000 Received: from localhost ([127.0.0.1]:57565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS2u-0005iF-MK for submit@debbugs.gnu.org; Sun, 29 Aug 2021 17:08:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:39576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS2s-0005i7-Ec for submit@debbugs.gnu.org; Sun, 29 Aug 2021 17:08:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKS2s-0003ne-7r for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:08:50 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:44828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKS2q-0007gX-9A for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:08:49 -0400 Received: by mail-wr1-x431.google.com with SMTP id g18so12007335wrc.11 for ; Sun, 29 Aug 2021 14:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=XTIiwUqhY8uki5CwOzrEsy5w8Iy/D5d8qFmtWjv2SOw=; b=fw/G0DAMH+7T5rtqw8pL5wMz8nv2BDdKT9T6oLeu/9w6bmWZv5117a3pmnP1zdKf7/ Q36w2rmOnKUL3E3cNzKgzpOldSyWWIYds8AyqeZQMp9Io0K/zcYeFz+MlwJH3o0GxlZY bLS5B++qTz3ML5+aVXcOAYU+Rve7QL/kWYn6mPq1vhhG6RtsWh9mkprhJimMDaJSGw28 nQdvTs2HMEUe5yYiAqcmJKZz/zMf2dbWgTDMvqhnUNHvAIYhYEn46OVqYoMK81ud0pQ9 SJJhTXUU2uSqqVzgbV2NXTdae25q8MT/j2I+iG/ydJLwGqxYNpmxX2e3MTF6sXP+KzMK hPIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=XTIiwUqhY8uki5CwOzrEsy5w8Iy/D5d8qFmtWjv2SOw=; b=pvEd1ottfbJjlWrnNE7eO3rLRrg45eD13zmCxDEfAtUKIKpv8xT/UtK0+I2r8PbX1c nIEkXxt4h76yOIFZrQyHFdyEfYHevsXYmhUwJq29Q+kp04R0BSTXSGMvOZR7rxNtpcKz GCibzhaHNRY57Dow/E0AgGxavpa21+V54wY408kuQRzjzTIGRwehJZw8RB5tPUbdXF08 sfSxWyrsJH2ZL8nORSCs6XMy1kzKxpWuUzdt9jCuVdS1YLnpzU8646nEAXvtc029JJsm h2qNbMsptKG1IHfYR0baOlKptMwNILx3GsFFwdsgOGX4HdVmu9+vMlsFDv/t5FF8tPxX A78g== X-Gm-Message-State: AOAM532E3F5Q+Nmo56oi/8/jHrUg9j7zL/2Evfsg/WNoLA/+aRvY+W18 YWY9rKCLPMmw+IXHEuF23vtcNsYB4ZI= X-Google-Smtp-Source: ABdhPJx5RinLQjZuglLl8QlccQAUZn8tRzC/JO5w6UmLeY6NGFmUwR/S5+0bkTQ0DMwVJcXe8Nf21A== X-Received: by 2002:a5d:47af:: with SMTP id 15mr22416143wrb.35.1630271326387; Sun, 29 Aug 2021 14:08:46 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id g76sm17185944wme.16.2021.08.29.14.08.45 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Aug 2021 14:08:46 -0700 (PDT) From: Dmitry Gutov Message-ID: Date: Mon, 30 Aug 2021 00:08:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=raaahh@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.8 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) vc-merge should call (vc-find-backend-function backend 'merge-file) instead. The change is trivial, but someone with any of the VCS listed above installed should test it. From unknown Tue Aug 19 23:12:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 Aug 2022 16:02:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50258 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 50258@debbugs.gnu.org Received: via spool by 50258-submit@debbugs.gnu.org id=B50258.16611840702682 (code B ref 50258); Mon, 22 Aug 2022 16:02:02 +0000 Received: (at 50258) by debbugs.gnu.org; 22 Aug 2022 16:01:10 +0000 Received: from localhost ([127.0.0.1]:41558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQ9rR-0000hA-Md for submit@debbugs.gnu.org; Mon, 22 Aug 2022 12:01:09 -0400 Received: from quimby.gnus.org ([95.216.78.240]:56228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQ9rP-0000gr-BC for 50258@debbugs.gnu.org; Mon, 22 Aug 2022 12:01:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=NjkVr66lvzL/3SWUiE7NN/cUNN8TWnBJyjsBpOt08yI=; b=mI83exMkAkt8bOfQNB99fniG/q A69arlMipnbwVZP5iimOPwEmpupC0YPpzp+CUUqz0WDguCTq+t1fZ/8GWdgm5Ag6ScLWjzhuw8jBd ziKi5PYrJ6Dopv0l358oE4Mbzi75I+cRmsQuawkUTX/lsfd4PJX+owCPK6b3OMNpG3Sc=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oQ9rH-000786-E5; Mon, 22 Aug 2022 18:01:01 +0200 From: Lars Ingebrigtsen In-Reply-To: (Dmitry Gutov's message of "Mon, 30 Aug 2021 00:08:44 +0300") References: X-Now-Playing: John Duncan's _Mort Aux Vaches: Seek_: "(untitled)" Date: Mon, 22 Aug 2022 18:00:58 +0200 Message-ID: <87fsho2rph.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov writes: > vc-merge should call (vc-find-backend-function backend 'merge-file) instead. > > The change is trivial, but someone with any of the VCS listed above > installed should test it. Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Dmitry Gutov writes: > vc-merge should call (vc-find-backend-function backend 'merge-file) instead. > > The change is trivial, but someone with any of the VCS listed above > installed should test it. I could test it -- did you have any particular test scenario in mind? Or are there test cases for this in vc-tests.el? From unknown Tue Aug 19 23:12:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 22 Aug 2022 23:29:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50258 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Lars Ingebrigtsen Cc: 50258@debbugs.gnu.org Received: via spool by 50258-submit@debbugs.gnu.org id=B50258.16612109297134 (code B ref 50258); Mon, 22 Aug 2022 23:29:02 +0000 Received: (at 50258) by debbugs.gnu.org; 22 Aug 2022 23:28:49 +0000 Received: from localhost ([127.0.0.1]:42006 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQGqe-0001r0-MQ for submit@debbugs.gnu.org; Mon, 22 Aug 2022 19:28:48 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:41835) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQGqa-0001qk-Bn for 50258@debbugs.gnu.org; Mon, 22 Aug 2022 19:28:47 -0400 Received: by mail-wr1-f53.google.com with SMTP id h24so15007748wrb.8 for <50258@debbugs.gnu.org>; Mon, 22 Aug 2022 16:28:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc; bh=OVOspP6oCtJRAURsUFCZPHc1mOP+2aELtK2ZT7/GAJw=; b=mXbkiLZMPAKeXsTAnOKCEk+hSZCFIcq2I+BnFLJw6UOCd7aZ1A//ni/nMrxGesGkrT epL1x/uugdBqsmZDsgnFJvf4yF5m3TiPA2JlVqmdanST18HlZiRWuMfSbM0BwLRHUvC+ pt99mf66S72bXhKjM8XAHE2MYa5yLQnKUnlZL1W8G434tue1mWsKdmom4wEZYRMtPtLg 5OJc+oaP00Mil0vd28DIVQt+RpVZ4XQHo+TLeLfaEMmDFCnS+skftQYjOogZYdSZn3tZ tuSgbxRYR/H8K7yCa7H/m9tcrIRruJcK54TOKnPhWVMyiTL/FZue1D5ej6iO8REe/NtN Nogg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc; bh=OVOspP6oCtJRAURsUFCZPHc1mOP+2aELtK2ZT7/GAJw=; b=rLOrPOX8rYgmncghn4oBQqXcK1S0WkBxGUbH/7iahJMnM8MEEWE2JrbdCoywg4RMw0 nS28SdKBWDAxWqX6PW9CgC31vH4u0xofFiDNmcnpC0H1EuE0MuePr2zY0vXTdecUdO1+ ynI/zqx/9A9sQPRd4jKI06xo2QtE4BfG/n6Cunv69f1VebON+wgfUEec3t58ot7eai/3 PQ38SpEs1c/td7WdyQcSEvlbD34WDf3tAVAG+q1Qg6ch4dNYYdJEQxSIx/4kFTCdWTdJ oqm9PRKesQE+kdxDzw64/b67K5iHr7EH0O5q+uGr/E1AAO0tmvp6cPY3QWfScLvlq0jO Q4oQ== X-Gm-Message-State: ACgBeo3ebHekSsmABIXCbgcfyyB69pC3Dp6qybKVdc6xWqWCnfxwnlAH EYhLZs1FgkhhjzhnuKInK/M= X-Google-Smtp-Source: AA6agR5SqZsHImzhh2a6QwKojC1EKSaV2oj7/WuTQxNBPqbi24V08aP6kQKGE76y+5VOA72UMEhj7g== X-Received: by 2002:a05:6000:2c1:b0:225:4999:bea4 with SMTP id o1-20020a05600002c100b002254999bea4mr6441494wry.241.1661210918345; Mon, 22 Aug 2022 16:28:38 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id j18-20020a05600c191200b003a5c1e916c8sm134170wmq.1.2022.08.22.16.28.37 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 22 Aug 2022 16:28:38 -0700 (PDT) Message-ID: <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> Date: Tue, 23 Aug 2022 02:28:36 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Content-Language: en-US References: <87fsho2rph.fsf@gnus.org> From: Dmitry Gutov In-Reply-To: <87fsho2rph.fsf@gnus.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 22.08.2022 19:00, Lars Ingebrigtsen wrote: > Dmitry Gutov writes: > >> vc-merge should call (vc-find-backend-function backend 'merge-file) instead. >> >> The change is trivial, but someone with any of the VCS listed above >> installed should test it. > I could test it -- did you have any particular test scenario in mind? > Or are there test cases for this in vc-tests.el? No, no tests. A scenario would be some situation where using vc-merge makes sense. I don't really remember how branches worked in SVN, much less CVS or RCS to write this step by step. Maybe testing is not even necessary: the change I'm proposing seems like a no-brainer, it just removes the requirement for the 'merge' backend methods to be defined (in per-file backends). No code uses them directly anyway. diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el index d3e53858c1..3274f1ec9d 100644 --- a/lisp/vc/vc.el +++ b/lisp/vc/vc.el @@ -2294,7 +2294,7 @@ vc-merge ((vc-find-backend-function backend 'merge-branch) (vc-call-backend backend 'merge-branch)) ;; Otherwise, do a per-file merge. - ((vc-find-backend-function backend 'merge) + ((vc-find-backend-function backend 'merge-file) (vc-buffer-sync) (dolist (file files) (let* ((state (vc-state file)) From unknown Tue Aug 19 23:12:56 2025 X-Loop: help-debbugs@gnu.org Subject: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 23 Aug 2022 10:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50258 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Dmitry Gutov Cc: 50258@debbugs.gnu.org Received: via spool by 50258-submit@debbugs.gnu.org id=B50258.16612511459461 (code B ref 50258); Tue, 23 Aug 2022 10:40:02 +0000 Received: (at 50258) by debbugs.gnu.org; 23 Aug 2022 10:39:05 +0000 Received: from localhost ([127.0.0.1]:42725 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQRJI-0002SW-Kt for submit@debbugs.gnu.org; Tue, 23 Aug 2022 06:39:04 -0400 Received: from quimby.gnus.org ([95.216.78.240]:37152) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQRJF-0002S2-W8 for 50258@debbugs.gnu.org; Tue, 23 Aug 2022 06:39:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:Date:References: In-Reply-To:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=q9FcA3XI9tl9vJf0l1srMU1Wuk1rXl8NT1aIs81q9EU=; b=Z7fEd4ZPTLuNOY0o722gTDKYcI GKCk5vtFXsrvz++UXdQWwn0Br/FoZSAb+1eJBbsvIHXfyoCT0s4BA3TNUCX5lXJ2dkK5FqD2HfiL4 HpHKRQNYutvXs5Nb/0ntONYSBqYh4ExAwrcXAhD3Ogf5l8p2DTFOplczL1aHM//Mabes=; Received: from [84.212.220.105] (helo=joga) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oQRJ7-0007V6-UB; Tue, 23 Aug 2022 12:38:56 +0200 From: Lars Ingebrigtsen In-Reply-To: <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> (Dmitry Gutov's message of "Tue, 23 Aug 2022 02:28:36 +0300") References: <87fsho2rph.fsf@gnus.org> <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> Face: iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAABGdBTUEAALGPC/xhBQAAACBj SFJNAAB6JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAD1BMVEXLuH7BqVJGOifN XUX////ApvMBAAAAAWJLR0QEj2jZUQAAAAd0SU1FB+YIFwojMoqe1e8AAAGdSURBVDjLbZOLkcQg CIbxtgHRBiI0sEr/vR0/PpK9PWcyIXy8MUSfJx+JKfmz5HNyotKERTIlkVYEpwUiF/DFAUIlGzAM +7SW6nauaExFeMgJI3gxHgdD/gA8jZq0sUMNhCpI2sRz9Kgk4qmDPl0pqnUwC3XAPAG8V8INwnmD aEZ7AF0eceJDa4D2DYryqkNo1T+LLWbOoFLyrDrcdoKoA4V0UmYz69VwoqXEVZSxA6jmq8cqMrtZ JPdYNg+IL2wDmUlEbRWqQw+IGgH057r72EBjAYT3aXCzfnEygDLCECAy9KwvMzHiqTlALm/fhlFd mrEnc73UiZKhhw00gFfnwJd9AxcwG8QI0BcICxR3DSGXAxRB6BXOJoiF//iG6vZA5yj1E5gMzCpG 6oGKXCmmPzdjD9Bec+x8g7isErbYxwE2b3GqxqPgT1GMJPaGP444MRceI98elgNk3zf39AjlLrgD id9U/bd9PUFCOfULGM1r5Mo39P0GKTpb1k8wW176B+gB+vk6wOV6bvAH2BGW0P0y/KOHC/ENbpue 7BdGeJat82m2jwAAACV0RVh0ZGF0ZTpjcmVhdGUAMjAyMi0wOC0yM1QxMDozNTo1MCswMDowMHy9 1JUAAAAldEVYdGRhdGU6bW9kaWZ5ADIwMjItMDgtMjNUMTA6MzU6NTArMDA6MDAN4GwpAAAAAElF TkSuQmCC X-Now-Playing: Eats Tapes's _Still Works_: "Snoot Dog" Date: Tue, 23 Aug 2022 12:38:53 +0200 Message-ID: <87y1vfs0qq.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Dmitry Gutov writes: > I don't really remember how branches worked in SVN, much less CVS or > RCS to write this step by step. Yeah, me neither. :-/ Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Dmitry Gutov writes: > I don't really remember how branches worked in SVN, much less CVS or > RCS to write this step by step. Yeah, me neither. :-/ > Maybe testing is not even necessary: the change I'm proposing seems > like a no-brainer, it just removes the requirement for the 'merge' > backend methods to be defined (in per-file backends). No code uses > them directly anyway. > > diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el > index d3e53858c1..3274f1ec9d 100644 > --- a/lisp/vc/vc.el > +++ b/lisp/vc/vc.el > @@ -2294,7 +2294,7 @@ vc-merge > ((vc-find-backend-function backend 'merge-branch) > (vc-call-backend backend 'merge-branch)) > ;; Otherwise, do a per-file merge. > - ((vc-find-backend-function backend 'merge) > + ((vc-find-backend-function backend 'merge-file) > (vc-buffer-sync) > (dolist (file files) > (let* ((state (vc-state file)) I think you should just go ahead and push -- if this turns out to be a problem in svn/cvs/rcs (which seems unlikely), somebody that uses those will probably file a bug report in a few years. From unknown Tue Aug 19 23:12:56 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Dmitry Gutov Subject: bug#50258: closed (Re: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]) Message-ID: References: <0f82704b-c0c3-ab77-e142-38daaf12a51a@yandex.ru> X-Gnu-PR-Message: they-closed 50258 X-Gnu-PR-Package: emacs Reply-To: 50258@debbugs.gnu.org Date: Wed, 24 Aug 2022 22:17:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1661379422-9931-1" This is a multi-part message in MIME format... ------------=_1661379422-9931-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] which was filed against the emacs package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 50258@debbugs.gnu.org. --=20 50258: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D50258 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1661379422-9931-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 50258-done) by debbugs.gnu.org; 24 Aug 2022 22:16:58 +0000 Received: from localhost ([127.0.0.1]:48388 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQygE-0002Zs-4y for submit@debbugs.gnu.org; Wed, 24 Aug 2022 18:16:58 -0400 Received: from mail-wr1-f53.google.com ([209.85.221.53]:41968) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oQygC-0002Ze-14 for 50258-done@debbugs.gnu.org; Wed, 24 Aug 2022 18:16:56 -0400 Received: by mail-wr1-f53.google.com with SMTP id h24so22398875wrb.8 for <50258-done@debbugs.gnu.org>; Wed, 24 Aug 2022 15:16:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:from:to:cc; bh=2i5VtmjRj3++3MeOSdu1HPl9bNK79QNEViZFqzf6I68=; b=Lvk5YV871xObziwRmxo0kqfnUEPxtcO3g04Nz3nFUzcneuKeXcwjRjrtsahW87l88Z NmSOB/h6rypV2Dzty35rTFpG/Xll/TspZmU/vamixGViAeCHhGqf6/Xb/8C/c5xeZdlA Sk7yDiyhrC6yX2PTN1U6KRWjHI0KZcIywG1CY52OyiGNrWwwvoMWvtwaaFMkHXJOtu8l tpbxqXk9IkOHaDo8MieUUr9UIjl3zG1P1J6Bv4/KSKesXYNobMvJhFGpHojGT4Dcj6fz iZ4dFWKbaPzXzyKR+TuVe5cmg/38i8joXYzIaiQBZY+VdoDBIh9EMt4xz7jnVPeEfJSt rfKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :sender:x-gm-message-state:from:to:cc; bh=2i5VtmjRj3++3MeOSdu1HPl9bNK79QNEViZFqzf6I68=; b=OspGvo13iL0FEVK0dnnSwNiEpk4lhIi/uR47A0ziyxr8K96aK3KzI2OvdrOoWrcO9W J9WwypB5zuTunrOfzIjUvV/rg+RXk0S0/7x9bgQWj4yQSrIwDmnX1EK7X+5Dhxd9BPBE YVdyn1Id1G/YFQykZs6GbrNKTcx7A0Ee1F9PajMpgJm40pcftuteemHW0KLTXNjlxm1/ ZStm1qBRf92zkrRShdtBbuttIktb2TpWqfkGgSFIisiStSnD1iDzz8n/aS2CBeC+Zgao h+EvwhCYBe7+/SWWarZ9MksFVHDOcn2f4xrn3qburQlPf+ujj81OXjkVq8nL/azqAE1R 2lHQ== X-Gm-Message-State: ACgBeo2k6x/QrntkkHggm7vHCPZcAjFBfDaaJEFb6bv2vA9MWT/S6f9j B4JDrmrYd3SY6FjQpI0/hJ0= X-Google-Smtp-Source: AA6agR54KDLJDS0ZikbEtJ2WiRPBBKE4L682N9tafoz7RQ3tChyqUH2LsQHE+5Q1/r6wC484ntq6+A== X-Received: by 2002:a05:6000:701:b0:225:3f77:9793 with SMTP id bs1-20020a056000070100b002253f779793mr576714wrb.202.1661379410110; Wed, 24 Aug 2022 15:16:50 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id v5-20020a1cac05000000b003a626055569sm3202806wme.16.2022.08.24.15.16.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 24 Aug 2022 15:16:49 -0700 (PDT) Message-ID: <0f82704b-c0c3-ab77-e142-38daaf12a51a@yandex.ru> Date: Thu, 25 Aug 2022 01:16:47 +0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Subject: Re: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Content-Language: en-US To: Lars Ingebrigtsen References: <87fsho2rph.fsf@gnus.org> <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> <87y1vfs0qq.fsf@gnus.org> From: Dmitry Gutov In-Reply-To: <87y1vfs0qq.fsf@gnus.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 0.5 (/) X-Debbugs-Envelope-To: 50258-done Cc: 50258-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.5 (/) On 23.08.2022 13:38, Lars Ingebrigtsen wrote: >> Maybe testing is not even necessary: the change I'm proposing seems >> like a no-brainer, it just removes the requirement for the 'merge' >> backend methods to be defined (in per-file backends). No code uses >> them directly anyway. >> >> diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el >> index d3e53858c1..3274f1ec9d 100644 >> --- a/lisp/vc/vc.el >> +++ b/lisp/vc/vc.el >> @@ -2294,7 +2294,7 @@ vc-merge >> ((vc-find-backend-function backend 'merge-branch) >> (vc-call-backend backend 'merge-branch)) >> ;; Otherwise, do a per-file merge. >> - ((vc-find-backend-function backend 'merge) >> + ((vc-find-backend-function backend 'merge-file) >> (vc-buffer-sync) >> (dolist (file files) >> (let* ((state (vc-state file)) > I think you should just go ahead and push -- if this turns out to be a > problem in svn/cvs/rcs (which seems unlikely), somebody that uses those > will probably file a bug report in a few years. Makes sense, pushed. Thanks. ------------=_1661379422-9931-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 29 Aug 2021 21:08:53 +0000 Received: from localhost ([127.0.0.1]:57565 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS2u-0005iF-MK for submit@debbugs.gnu.org; Sun, 29 Aug 2021 17:08:52 -0400 Received: from lists.gnu.org ([209.51.188.17]:39576) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS2s-0005i7-Ec for submit@debbugs.gnu.org; Sun, 29 Aug 2021 17:08:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKS2s-0003ne-7r for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:08:50 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:44828) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKS2q-0007gX-9A for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:08:49 -0400 Received: by mail-wr1-x431.google.com with SMTP id g18so12007335wrc.11 for ; Sun, 29 Aug 2021 14:08:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language:content-transfer-encoding; bh=XTIiwUqhY8uki5CwOzrEsy5w8Iy/D5d8qFmtWjv2SOw=; b=fw/G0DAMH+7T5rtqw8pL5wMz8nv2BDdKT9T6oLeu/9w6bmWZv5117a3pmnP1zdKf7/ Q36w2rmOnKUL3E3cNzKgzpOldSyWWIYds8AyqeZQMp9Io0K/zcYeFz+MlwJH3o0GxlZY bLS5B++qTz3ML5+aVXcOAYU+Rve7QL/kWYn6mPq1vhhG6RtsWh9mkprhJimMDaJSGw28 nQdvTs2HMEUe5yYiAqcmJKZz/zMf2dbWgTDMvqhnUNHvAIYhYEn46OVqYoMK81ud0pQ9 SJJhTXUU2uSqqVzgbV2NXTdae25q8MT/j2I+iG/ydJLwGqxYNpmxX2e3MTF6sXP+KzMK hPIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language:content-transfer-encoding; bh=XTIiwUqhY8uki5CwOzrEsy5w8Iy/D5d8qFmtWjv2SOw=; b=pvEd1ottfbJjlWrnNE7eO3rLRrg45eD13zmCxDEfAtUKIKpv8xT/UtK0+I2r8PbX1c nIEkXxt4h76yOIFZrQyHFdyEfYHevsXYmhUwJq29Q+kp04R0BSTXSGMvOZR7rxNtpcKz GCibzhaHNRY57Dow/E0AgGxavpa21+V54wY408kuQRzjzTIGRwehJZw8RB5tPUbdXF08 sfSxWyrsJH2ZL8nORSCs6XMy1kzKxpWuUzdt9jCuVdS1YLnpzU8646nEAXvtc029JJsm h2qNbMsptKG1IHfYR0baOlKptMwNILx3GsFFwdsgOGX4HdVmu9+vMlsFDv/t5FF8tPxX A78g== X-Gm-Message-State: AOAM532E3F5Q+Nmo56oi/8/jHrUg9j7zL/2Evfsg/WNoLA/+aRvY+W18 YWY9rKCLPMmw+IXHEuF23vtcNsYB4ZI= X-Google-Smtp-Source: ABdhPJx5RinLQjZuglLl8QlccQAUZn8tRzC/JO5w6UmLeY6NGFmUwR/S5+0bkTQ0DMwVJcXe8Nf21A== X-Received: by 2002:a5d:47af:: with SMTP id 15mr22416143wrb.35.1630271326387; Sun, 29 Aug 2021 14:08:46 -0700 (PDT) Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id g76sm17185944wme.16.2021.08.29.14.08.45 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Aug 2021 14:08:46 -0700 (PDT) To: bug-gnu-emacs@gnu.org From: Dmitry Gutov Subject: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Message-ID: Date: Mon, 30 Aug 2021 00:08:44 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=2a00:1450:4864:20::431; envelope-from=raaahh@gmail.com; helo=mail-wr1-x431.google.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 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.25, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Spam-Score: -0.8 (/) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.8 (-) vc-merge should call (vc-find-backend-function backend 'merge-file) instead. The change is trivial, but someone with any of the VCS listed above installed should test it. ------------=_1661379422-9931-1--