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: Tue, 23 Aug 2022 12:38:53 +0200 Message-ID: <87y1vfs0qq.fsf@gnus.org> References: <87fsho2rph.fsf@gnus.org> <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="2924"; 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 Tue Aug 23 12:42:23 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 1oQRMT-0000aX-Jp for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Aug 2022 12:42:21 +0200 Original-Received: from localhost ([::1]:43286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQRMS-0003po-Gu for geb-bug-gnu-emacs@m.gmane-mx.org; Tue, 23 Aug 2022 06:42:20 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56592) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQRKF-00025w-Hb for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 06:40:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:52976) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQRKE-00007f-Ma for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 06:40:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oQRKE-0002Tq-EM for bug-gnu-emacs@gnu.org; Tue, 23 Aug 2022 06:40: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: 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 Original-Received: via spool by 50258-submit@debbugs.gnu.org id=B50258.16612511459461 (code B ref 50258); Tue, 23 Aug 2022 10:40:02 +0000 Original-Received: (at 50258) by debbugs.gnu.org; 23 Aug 2022 10:39:05 +0000 Original-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 Original-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=; 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 1oQRJ7-0007V6-UB; Tue, 23 Aug 2022 12:38:56 +0200 In-Reply-To: <2b390ac0-e121-d485-983d-1bc4673864d4@yandex.ru> (Dmitry Gutov's message of "Tue, 23 Aug 2022 02:28:36 +0300") 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" 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:240520 Archived-At: 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.