Subject: bug#50258: closed (Re: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs])

From: [email-masked] (GNU bug Tracking System)
Date: Wed, 24 Aug 2022 22:17:02 +0000

Your bug report

#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]

which was filed against the emacs package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
50258: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=50258
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]
From: Dmitry Gutov <[email-masked]>
To: Lars Ingebrigtsen <[email-masked]>
Cc: [email-masked]
Date: Thu, 25 Aug 2022 01:16:47 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

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.

Subject: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]
From: Dmitry Gutov <[email-masked]>
To: [email-masked]
Date: Mon, 30 Aug 2021 00:08:44 +0300
List-Id: <debbugs-submit.debbugs.gnu.org>

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.