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: Mon, 30 Aug 2021 00:08:44 +0300 Message-ID: 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="5187"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 To: 50258@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 29 23:09:12 2021 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 1mKS3D-0001Ak-T8 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Aug 2021 23:09:11 +0200 Original-Received: from localhost ([::1]:36184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKS3B-0003og-MN for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Aug 2021 17:09:09 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42746) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKS35-0003oF-0q for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:09:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46019) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKS34-0007qV-Pk for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:09:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKS34-0005if-JR for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:09:02 -0400 X-Loop: help-debbugs@gnu.org 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-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.163027133321967 (code B ref -1); Sun, 29 Aug 2021 21:09:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 29 Aug 2021 21:08:53 +0000 Original-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 Original-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 Original-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 Original-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 Original-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) Original-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) Content-Language: en-US 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-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:212971 Archived-At: 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.