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#4179: vc-merge with svn: syntax error in revision arg. Date: Mon, 30 Aug 2021 00:09:39 +0300 Message-ID: <5a03bd09-5099-edc3-6c27-12bbaed5724f@yandex.ru> References: <87my5ycpj3.fsf@urmel.duenenhof-wilhelm.de> <200908200259.n7K2x8sj004573@godzilla.ics.uci.edu> <200908261804.n7QI4vh7023115@godzilla.ics.uci.edu> <878s0nsi0l.fsf@gnus.org> <7f7b777c-1ae1-8ca7-bc5c-80f19baba0e6@yandex.ru> <87y28kaspp.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="11558"; 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 Cc: Dieter Wilhelm , Dan Nicolaescu , Stefan Monnier , 4179@debbugs.gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Aug 29 23:10:31 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 1mKS4T-0002qm-TO for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Aug 2021 23:10:29 +0200 Original-Received: from localhost ([::1]:36754 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mKS4S-0004lQ-QM for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 29 Aug 2021 17:10:28 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:42862) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mKS44-0004jF-41 for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:10:05 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:46024) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mKS42-0008Uj-IN for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:10:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mKS42-0005kZ-DC for bug-gnu-emacs@gnu.org; Sun, 29 Aug 2021 17:10: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:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 4179 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 4179-submit@debbugs.gnu.org id=B4179.163027138922079 (code B ref 4179); Sun, 29 Aug 2021 21:10:02 +0000 Original-Received: (at 4179) by debbugs.gnu.org; 29 Aug 2021 21:09:49 +0000 Original-Received: from localhost ([127.0.0.1]:57570 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS3p-0005k3-13 for submit@debbugs.gnu.org; Sun, 29 Aug 2021 17:09:49 -0400 Original-Received: from mail-wm1-f43.google.com ([209.85.128.43]:45571) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mKS3n-0005jp-5T for 4179@debbugs.gnu.org; Sun, 29 Aug 2021 17:09:47 -0400 Original-Received: by mail-wm1-f43.google.com with SMTP id j17-20020a05600c1c1100b002e754875260so8078416wms.4 for <4179@debbugs.gnu.org>; Sun, 29 Aug 2021 14:09:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=hCZjkhAVp0gjF3yw5oyifBPzjJ2fb06FftozBVGhSEg=; b=mb3j7Xst/IZfujYsWHoRqyeoecF4i1pan+H/MeXSoHZTeXyjDf7vzuvrfBLLHtV2Df pwecWMtKuRAw/6Yy6wx2aeNDFcfgo26T5JdthjisrxtsIxkekyh24wIVN2uvajX9i3y0 yzD5/ol9Ck6DT5O2Thx3WuTT4yoZRX7HQMhBkL/PFPXdCG6A6hfDLUQD0m7xg6B290zI uZMFygb6TwBwurldgmQarG79ZptX0h7DRk5gPayiO5yf8TTJBo3LFLtq1t6Ot834toNY OL+MvFwk5aMaCPsRmdttDNYFN3jJmWFR9yvQhjeYUzuOKZorbNwZedKBwdnD3MD45okl Sptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; 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=hCZjkhAVp0gjF3yw5oyifBPzjJ2fb06FftozBVGhSEg=; b=NeNTeF6eSRaeEjjo8JmRrdKJeJHtd1UiaevdiIED0OY6u6zeNRq/nRvEpOn2n8fA66 C7qA8qxUvgdkmWjWibtlqQq9wKzi7MqB0TS/cDM8ENax3jrfDMf9JR9kldWjUjfrjlFS srLMpdg8y7nqqlVBRGvbWytoc8FU7Rwt5oJ+MMDa4zz0Z6wk2itfqlt2Pi5PLLPb+B5Z 9Ih8ZaM8EpfYz9VA7VAZ/BdNmoAflcfa5Plh3VmwOOV0js+FiCEoiXBt3H+WKgNss75N SxWyyer/Pw3rWF0m3JhSl+RivRMeycT0r40jbRv4vijoqZJm3EuqzrN3nyFRS3P8tZdn Nmmg== X-Gm-Message-State: AOAM533fLQ2BGebNUUWB+PsgcjMFOYtJ4zQA8e519eHBY3kOzpNhwbht z7oKD876TYvripLl9QVND17Nxla+3CY= X-Google-Smtp-Source: ABdhPJzDIlImOnuLCIhD77wK8fHmOwTyLZDMmO0UnoGZeRYDn0b4ZESV6amv3Qm2hUZcix+DeZKMBg== X-Received: by 2002:a05:600c:4048:: with SMTP id j8mr3704313wmm.173.1630271381320; Sun, 29 Aug 2021 14:09:41 -0700 (PDT) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id f17sm15455561wrt.63.2021.08.29.14.09.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 29 Aug 2021 14:09:40 -0700 (PDT) In-Reply-To: <87y28kaspp.fsf@gnus.org> Content-Language: en-US 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:212972 Archived-At: On 29.08.2021 23:42, Lars Ingebrigtsen wrote: >> Also, vc-merge should call (vc-find-backend-function >> backend 'merge-file) instead of (vc-find-backend-function backend >> 'merge). They only seem equivalent for now by lucky accident. I'd do >> that change myself now, but it's similarly hard for me to quickly test >> any of the affected backends, and this operation is not covered by >> vc-tests.el. > Perhaps open a new bug report for this and see whether anybody > volunteers to implement and test? Filed bug#50258.