From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#3860: vc-svn calls "svn resolved" without permission Date: Fri, 22 Jan 2021 09:29:22 +0200 Message-ID: <83r1md5t0t.fsf@gnu.org> References: <87k0s66y57.fsf@gnus.org> <835z3q6q6q.fsf@gnu.org> <6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="17652"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 3860@debbugs.gnu.org, larsi@gnus.org, jknight@fuhm.net, spiegel@gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Jan 22 08:30:18 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l2qte-0004V0-4c for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 08:30:18 +0100 Original-Received: from localhost ([::1]:52080 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2qtd-0001ZP-7b for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Jan 2021 02:30:17 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:43432) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2qtP-0001ZI-9E for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 02:30:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48408) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2qtO-0000dt-In for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 02:30:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2qtO-0008WO-Fo for bug-gnu-emacs@gnu.org; Fri, 22 Jan 2021 02:30:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Jan 2021 07:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 3860 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: moreinfo Original-Received: via spool by 3860-submit@debbugs.gnu.org id=B3860.161130057232690 (code B ref 3860); Fri, 22 Jan 2021 07:30:02 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 22 Jan 2021 07:29:32 +0000 Original-Received: from localhost ([127.0.0.1]:59954 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2qsu-0008VC-J7 for submit@debbugs.gnu.org; Fri, 22 Jan 2021 02:29:32 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:50254) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2qst-0008Uz-80 for 3860@debbugs.gnu.org; Fri, 22 Jan 2021 02:29:31 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:59347) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2qsn-0000Oj-7l; Fri, 22 Jan 2021 02:29:25 -0500 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2632 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l2qsl-0006QH-Vm; Fri, 22 Jan 2021 02:29:24 -0500 In-Reply-To: <6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru> (message from Dmitry Gutov on Fri, 22 Jan 2021 00:35:07 +0200) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:198358 Archived-At: > Cc: 3860@debbugs.gnu.org, jknight@fuhm.net, spiegel@gnu.org > From: Dmitry Gutov > 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.