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

Previous Next

Full log

Message #36 received at 3860 <at> debbugs.gnu.org (full text, mbox):

From: Mauro Aranda <maurooaranda <at> gmail.com>
To: 3860 <at> debbugs.gnu.org
Cc: jknight <at> fuhm.net, Eli Zaretskii <eliz <at> gnu.org>,
 Lars Ingebrigtsen <larsi <at> gnus.org>, spiegel <at> gnu.org,
 Dmitry Gutov <dgutov <at> yandex.ru>
Subject: Re: bug#3860: vc-svn calls "svn resolved" without permission
Date: Thu, 13 Mar 2025 09:04:52 -0300

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

Eli Zaretskii <eliz <at> gnu.org> writes:

>> Cc: 3860 <at> debbugs.gnu.org, jknight <at> fuhm.net, spiegel <at> gnu.org
>> From: Dmitry Gutov <dgutov <at> yandex.ru>
>> Date: Fri, 22 Jan 2021 00:35:07 +0200
>>
>> On 21.01.2021 21:33, Eli Zaretskii wrote:
>> > I think if we are going to make this optional with SVN, we should make
>> > it optional with the other back-ends as well.  VC always presented a
>> > uniform UI and user experience with all back-ends, as far as possible
>> > and reasonable.  In this case, I think automatically marking the
>> > conflicts as resolved makes a lot of sense, but I won't object to make
>> > it opt-out, as long as it's done for every VCS that can support it.
>>
>> So someone might want to generalize the Git-specific variable:
>> vc-git-resolve-conflicts.
>
> Yes, I think so.
>
>> But they'd have to consider what to do with the special value
>> 'unstage-maybe', which doesn't really make sense for other backends.
>
> Right.

I took a shot at it.  Please review the attached patch.

[0001-Make-marking-conflicted-files-as-resolved-upon-savin.patch (text/x-patch, attachment)]

Previous Next

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