GNU bug report logs - #3860
vc-svn calls "svn resolved" without permission

Previous Next

Package: emacs;

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

View this message in rfc822 format

From: Lars Ingebrigtsen <larsi <at> gnus.org>
To: Dmitry Gutov <dgutov <at> yandex.ru>
Cc: 3860 <at> debbugs.gnu.org, Eli Zaretskii <eliz <at> gnu.org>, spiegel <at> gnu.org, jknight <at> fuhm.net
Subject: bug#3860: vc-svn calls "svn resolved" without permission
Date: Fri, 22 Jan 2021 18:25:05 +0100

Dmitry Gutov <dgutov <at> yandex.ru> writes:

> So someone might want to generalize the Git-specific variable:
> vc-git-resolve-conflicts.

Yeah, makes sense.

> But they'd have to consider what to do with the special value
> 'unstage-maybe', which doesn't really make sense for other backends.

Yup.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no
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.