From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs] Date: Mon, 22 Aug 2022 18:00:58 +0200 Message-ID: <87fsho2rph.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6042"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/29.0.50 (gnu/linux) Cc: 50258@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 22 20:11:36 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 1oQBtf-0001Mc-La for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 Aug 2022 20:11:35 +0200 Original-Received: from localhost ([::1]:39982 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQBte-0005ES-MK for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 22 Aug 2022 14:11:34 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQ9sI-0003dH-Il for bug-gnu-emacs@gnu.org; Mon, 22 Aug 2022 12:02:14 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:51809) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQ9sI-0006qD-8m for bug-gnu-emacs@gnu.org; Mon, 22 Aug 2022 12:02:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQ9sI-0000iL-2F for bug-gnu-emacs@gnu.org; Mon, 22 Aug 2022 12:02:02 -0400 X-Loop: help-debbugs@gnu.org 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 Original-Received: via spool by 50258-submit@debbugs.gnu.org id=B50258.16611840702682 (code B ref 50258); Mon, 22 Aug 2022 16:02:02 +0000 Original-Received: (at 50258) by debbugs.gnu.org; 22 Aug 2022 16:01:10 +0000 Original-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 Original-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=; Original-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 In-Reply-To: (Dmitry Gutov's message of "Mon, 30 Aug 2021 00:08:44 +0300") X-Now-Playing: John Duncan's _Mort Aux Vaches: Seek_: "(untitled)" 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:240446 Archived-At: 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?