GNU bug report logs -
#3860
vc-svn calls "svn resolved" without permission
Previous Next
Reported by: James Y Knight <jknight <at> fuhm.net>
Date: Wed, 15 Jul 2009 20:30:03 UTC
Severity: normal
Fixed in version 31.1
Done: Mauro Aranda <maurooaranda <at> gmail.com>
Bug is archived. No further changes may be made.
Full log
Message #53 received at 3860 <at> debbugs.gnu.org (full text, mbox):
> Date: Mon, 17 Mar 2025 06:57:54 -0300
> From: Mauro Aranda <maurooaranda <at> gmail.com>
> Cc: 3860 <at> debbugs.gnu.org, larsi <at> gnus.org, jknight <at> fuhm.net, spiegel <at> gnu.org,
> dgutov <at> yandex.ru
>
> On 15/3/25 09:13, Eli Zaretskii wrote:
> >> Date: Thu, 13 Mar 2025 12:11:21 -0300
> >> Cc: 3860 <at> debbugs.gnu.org, dgutov <at> yandex.ru, larsi <at> gnus.org,
> spiegel <at> gnu.org,
> >> jknight <at> fuhm.net
> >> From: Mauro Aranda <maurooaranda <at> gmail.com>
> >>
> >> Thanks. Revised patch attached.
> >
> > Thanks, this LGTM.
>
> Thanks. Installed on master, and closing the bug.
I've just been bitten by this change. Its effect is that any package
that loads or 'require's vc-SOMETHING, without also loading 'vc', will
likely signal an error:
void variable vc-resolve-conflicts
In my case, the victim was admin/gitmerge.el, which only loads
vc-git.el,
The various vc-FOO.el files only 'require' vc when compiling, which
doesn't solve the run-time problem.
So we will need either to make vc-resolve-conflicts autoloaded (which
is generally discouraged for defcustom's), or manually 'require' vc in
the various functions that reference vc-resolve-conflicts.
Are there any other solutions?
This bug report was last modified 53 days ago.
Previous Next
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.