From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.bugs Subject: bug#3860: vc-svn calls "svn resolved" without permission Date: Fri, 22 Jan 2021 00:35:07 +0200 Message-ID: <6b6005b6-6efc-63f1-404d-d07f910281ef@yandex.ru> References: <87k0s66y57.fsf@gnus.org> <835z3q6q6q.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="25825"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 Cc: 3860@debbugs.gnu.org, jknight@fuhm.net, spiegel@gnu.org To: Eli Zaretskii , Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 21 23:36:19 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 1l2iYt-0006d4-4n for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 23:36:19 +0100 Original-Received: from localhost ([::1]:34878 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2iYs-0007ae-75 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 17:36:18 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46984) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2iYc-0007aV-1w for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 17:36:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:48082) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2iYb-00013V-RJ for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 17:36:01 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2iYb-00049S-Pd for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 17:36:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Jan 2021 22:36:01 +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.161126851815905 (code B ref 3860); Thu, 21 Jan 2021 22:36:01 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 21 Jan 2021 22:35:18 +0000 Original-Received: from localhost ([127.0.0.1]:59628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2iXt-00048T-NM for submit@debbugs.gnu.org; Thu, 21 Jan 2021 17:35:17 -0500 Original-Received: from mail-wm1-f49.google.com ([209.85.128.49]:35643) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2iXs-00048E-Aw for 3860@debbugs.gnu.org; Thu, 21 Jan 2021 17:35:16 -0500 Original-Received: by mail-wm1-f49.google.com with SMTP id e15so2819438wme.0 for <3860@debbugs.gnu.org>; Thu, 21 Jan 2021 14:35:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=nDVcWQTltM/CKzRNRnsz3eTARuKNwBMpQj1tP7Boj30=; b=gsjSKJkNdDJtlFl08plcOi3kt461qAmomk3clURONio7KU/etXhtOSK7TY6HEmBf52 rRGkbfpR0xwhu2V/uz9r4XxI5NKQMY9wAv5Wc3fodJMqz8LGV7O62rHyHf9Jj5oG4yAs lrRjNw2Q1BOMFFZLL3gYwNW20h5ImQo4Fgv44s8VMhw+/4athnnX65wKuzd6yWGCydmT mMJrVrxO9vZeclOhnEk/NNsOuEUPs7XAauPa+evC055ihnYZksNwrqboPHu2dpjNpdqP GYfbhJpR9lk/qHgLJ3Qef9GBhVDbfXwabJRZ1k23tVO+SdMltUh+pWSa4vNzzSAFVAoT WqCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:subject:to:cc:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=nDVcWQTltM/CKzRNRnsz3eTARuKNwBMpQj1tP7Boj30=; b=uBo8rYHvr9obZYwC4/q5ftc+DKjiyr6kk0IiaXYVKmH2l+5TtbElPzTFEdUtYoMgjw 9Vzr5PtJK0nWnpeR0Hp0Lm4wNo1oQ/GeVOSB1Nlopoy8iQ10rHG03HWTZfA/7fPm3gmU m5wzyA46TZstBDEb39c+UZl1+L3sgC1U1Ug2K2im99AyiW+T5EUR/OGVFW61Hb6rSXwL Zh471WLvASuiqGEoJSqByvkPd5AluKmXZQGwUv9+RoG5j0rRsl594wzi6Hj9cNkITd00 iEmj6YhEUcHcMiRrCGwLrwibwamioUEIVsC/c0j4J8aBwq16FLQ5VtAkmjzLL+GBjg4l gH3A== X-Gm-Message-State: AOAM530pdgsR63J0Qcv33tVDMWuA4M72L8i62YJXsSeC7XhI95SXbn+s TkK2sHwW1U1y4YypvdWw83c= X-Google-Smtp-Source: ABdhPJxQygX6wyoeucVylxkVhnQtZpSS5cDgGeH4jzPM8zl8duZnC6/ebN9PHiTkYIKkeLaWa0Oxgw== X-Received: by 2002:a1c:f70c:: with SMTP id v12mr1217985wmh.77.1611268510489; Thu, 21 Jan 2021 14:35:10 -0800 (PST) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id q2sm9408179wma.6.2021.01.21.14.35.08 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 21 Jan 2021 14:35:09 -0800 (PST) In-Reply-To: <835z3q6q6q.fsf@gnu.org> Content-Language: en-US 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:198353 Archived-At: 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. But they'd have to consider what to do with the special value 'unstage-maybe', which doesn't really make sense for other backends.