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.bugs Subject: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Date: Thu, 25 Aug 2022 01:16:47 +0300 Message-ID: <0f82704b-c0c3-ab77-e142-38daaf12a51a@yandex.ru> References: <87fsho2rph.fsf@gnus.org> <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> <87y1vfs0qq.fsf@gnus.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="32184"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.9.1 Cc: 50258-done@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 25 00:18:24 2022 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1oQyhc-0008B5-0B for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 25 Aug 2022 00:18:24 +0200 Original-Received: from localhost ([::1]:34358 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQyhZ-0008FA-FQ for geb-bug-gnu-emacs@m.gmane-mx.org; Wed, 24 Aug 2022 18:18:22 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:41328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQygg-0008Cq-59 for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2022 18:17:26 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:58639) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQygI-0006TD-II for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2022 18:17:25 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQygI-0002aH-AY for bug-gnu-emacs@gnu.org; Wed, 24 Aug 2022 18:17:02 -0400 Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Wed, 24 Aug 2022 22:17:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 50258 X-GNU-PR-Package: emacs Mail-Followup-To: 50258@debbugs.gnu.org, dgutov@yandex.ru, dgutov@yandex.ru Original-Received: via spool by 50258-done@debbugs.gnu.org id=D50258.16613794189917 (code D ref 50258); Wed, 24 Aug 2022 22:17:02 +0000 Original-Received: (at 50258-done) by debbugs.gnu.org; 24 Aug 2022 22:16:58 +0000 Original-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 Original-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 Original-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) Original-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) Content-Language: en-US In-Reply-To: <87y1vfs0qq.fsf@gnus.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:240664 Archived-At: 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.