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

Previous Next

Full log

View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#50258: closed (Don't call (vc-find-backend-function backend
 'merge) [svn/cvs/rcs])
Date: Wed, 24 Aug 2022 22:17:02 +0000

[Message part 1 (text/plain, inline)]

Your message dated Thu, 25 Aug 2022 01:16:47 +0300
with message-id <0f82704b-c0c3-ab77-e142-38daaf12a51a <at> yandex.ru>
and subject line Re: bug#50258: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]
has caused the debbugs.gnu.org bug report #50258,
regarding Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
50258: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=50258
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems

[Message part 2 (message/rfc822, inline)]

From: Dmitry Gutov <dgutov <at> yandex.ru>
To: bug-gnu-emacs <at> gnu.org
Subject: Don't call (vc-find-backend-function backend 'merge) [svn/cvs/rcs]
Date: Mon, 30 Aug 2021 00:08:44 +0300

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.

[Message part 3 (message/rfc822, inline)]

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

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.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.