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: Mon, 25 Jan 2021 03:57:06 +0200 Message-ID: References: <87k0s66y57.fsf@gnus.org> <8d28786a01b6108e538ed5bec3c9094d.squirrel@fuhm.net> 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="35707"; 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, spiegel@gnu.org To: James Y Knight , Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 25 02:58:23 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 1l3r94-0009B7-Ky for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 25 Jan 2021 02:58:22 +0100 Original-Received: from localhost ([::1]:58394 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3r93-0008Qv-MV for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Jan 2021 20:58:21 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:56648) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3r8l-0008Qm-1g for bug-gnu-emacs@gnu.org; Sun, 24 Jan 2021 20:58:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54244) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3r8k-0005Ey-Bj for bug-gnu-emacs@gnu.org; Sun, 24 Jan 2021 20:58:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3r8k-0005vI-AE for bug-gnu-emacs@gnu.org; Sun, 24 Jan 2021 20:58:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Dmitry Gutov Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Jan 2021 01:58:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 3860 X-GNU-PR-Package: emacs Original-Received: via spool by 3860-submit@debbugs.gnu.org id=B3860.161153983722714 (code B ref 3860); Mon, 25 Jan 2021 01:58:02 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 25 Jan 2021 01:57:17 +0000 Original-Received: from localhost ([127.0.0.1]:37557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3r81-0005uH-Ec for submit@debbugs.gnu.org; Sun, 24 Jan 2021 20:57:17 -0500 Original-Received: from mail-ed1-f43.google.com ([209.85.208.43]:43272) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3r7z-0005u3-Lz for 3860@debbugs.gnu.org; Sun, 24 Jan 2021 20:57:16 -0500 Original-Received: by mail-ed1-f43.google.com with SMTP id n6so13326483edt.10 for <3860@debbugs.gnu.org>; Sun, 24 Jan 2021 17:57:15 -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=Dt9BdAWqnGB4/z1sDRgGDKN0jFXD+/d+O3NdOTJCqyw=; b=IovQi6fqR9MVK+exvcu2JcxkO8hVBSyfSea2GGQng1y1JR6zKT/IjD97MLugHPqQZ6 mOlSxGr35wiUzML/zrwHlHJrlbMqdIfhWbK2/JgwD04GpxwGgQWbaMHjg53rOX5+y9fQ g7NW23k+foiUd/KrTgtwfmK1jjlWEDKQBrFMnOm6zjU0IZyn50zEebBV4QELt2Z9MT5n YcLFdr5e7mWHI3UC580G3h5Sz7XY4D4zjNYRTQiFd3DU3rbzR515bWV5fwIAfzA9GY9p tZ7fRVZvDU9guSINntZtKT8vS89K78Tqz61HpJsOz5rupYPl1oOD/NrBIE+bbMmrlRxx NUaQ== 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=Dt9BdAWqnGB4/z1sDRgGDKN0jFXD+/d+O3NdOTJCqyw=; b=ViuvhyJ/gGrFbZO9HBLKTtcTrvsqjvN+9VtF0BYcW2Za5tBUm9V35EmzWYLCXO5lzi 1fB0VJW35tckYmpiDbwcQ+35QnWZLk21pLihfO9RRlrVnlfifDJAmVDjJLxbFF+9A9Sr fsclu2zATm2s6drNN/lEqEtkmzCtwp8aVaMfr71rsHj8qUT8rGSu5Wlo7+0dvJhP+RO2 /SYClz6qsG/899FJ7NRxy4BVvkfbEi0ZzkMayZ8XHySzbF4tkWgggEo2+HvcLmqDRxPI hs2pjsYXGPzcSzt7YaT4bzgUKMC58S/UDCoY3/ior8H6slzN68p7jxhW/Q272m08dNkK Xsww== X-Gm-Message-State: AOAM533ceCx0qRCAdyUK2TOxEJnn62XPJaqVLgigEh5/C6v4iWkfbC64 P3mkJVU5m8O25TGU45rtSdo= X-Google-Smtp-Source: ABdhPJwSbNzkjLWbcaBwiPwVnpmBsUYhnzvD0i0bNemDKhPnQyipqWr2HzuT88/zHRxGjhwfuiwBHg== X-Received: by 2002:aa7:c44f:: with SMTP id n15mr413550edr.150.1611539829684; Sun, 24 Jan 2021 17:57:09 -0800 (PST) Original-Received: from [192.168.0.6] ([46.251.119.176]) by smtp.googlemail.com with ESMTPSA id w16sm9938257edv.4.2021.01.24.17.57.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 24 Jan 2021 17:57:08 -0800 (PST) In-Reply-To: <8d28786a01b6108e538ed5bec3c9094d.squirrel@fuhm.net> 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:198541 Archived-At: On 25.01.2021 00:36, James Y Knight wrote: > I haven't used svn in years at this point, so I really don't care what > happens with vc-svn anymore. But I had personally long ago worked around > this bug with: > (defadvice vc-svn-resolve-when-done (around dont-svn-resolve activate) > nil) Fair enough. > However, I will mention that I find the equivalent behavior in Emacs's Git > integration just as bad -- for the same reason of it discarding important > information! There's a reason that "git add" is a separate operation, and > having emacs silently run that when doing a "save" operation destroys > information, unexpectedly. > > I really think this behavior should _never_ have been made default > behavior in _any_ VC mode. Discarding data is quite a bad default, and > extremely unexpected from "save". But, hey, at least vc-git can be > configured, so that's nice. > > (And, I'll note that it took me at least a _year_ to figure out that the > broken behavior after resolving conflicts in Git was an emacs vc-git bug, > and not Git itself having lost the ability to 3-way-conflict-diff the > conflict resolution! It's incredibly non-obvious that emacs is breaking > this!) > > I'm not the only one to complain about this, e.g. > https://emacs.stackexchange.com/questions/51206/disabling-automatic-add-after-resolving-git-conflict > > For that matter, bug 20292 which added the emacs config option has > multiple complaints about this behavior, as well... "Multiple complaints" seems to be an overstatement: we have one question of SE, and one disagreement in the bug comments. The disagreement is from the current Git maintainer, which is significant, but still not a gospel, since VC tries to provide a "unified" interface to many VCSes, not just Git. That said, I personally customize vc-git-resolve-conflicts to nil, and 'C-x v v' now does resolve the conflicts all right (even though it doesn't refresh the vc-state of such buffers automatically). So nil works okay, and it would be my vote. But the current behavior of that variable and its default value have been requested by Emacs maintainers, one former and one current. As such, I'll let the maintainers decide on whether the default can be changed here.