From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "James Y Knight" Newsgroups: gmane.emacs.bugs Subject: bug#3860: vc-svn calls "svn resolved" without permission Date: Sun, 24 Jan 2021 17:36:27 -0500 Message-ID: <8d28786a01b6108e538ed5bec3c9094d.squirrel@fuhm.net> References: <87k0s66y57.fsf@gnus.org> Mime-Version: 1.0 Content-Type: text/plain;charset=UTF-8 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="33985"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: SquirrelMail/1.4.23 [SVN] Cc: 3860@debbugs.gnu.org, spiegel@gnu.org To: "Lars Ingebrigtsen" Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Jan 25 02:09:34 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 1l3qNq-0008dP-2U for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 25 Jan 2021 02:09:34 +0100 Original-Received: from localhost ([::1]:45528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l3qNo-0000Tt-BC for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Jan 2021 20:09:32 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:52174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l3qNL-0000Tn-8G for bug-gnu-emacs@gnu.org; Sun, 24 Jan 2021 20:09:03 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54236) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l3qNL-0006XP-0P for bug-gnu-emacs@gnu.org; Sun, 24 Jan 2021 20:09:03 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l3qNK-0004oW-SO for bug-gnu-emacs@gnu.org; Sun, 24 Jan 2021 20:09:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: "James Y Knight" Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 25 Jan 2021 01:09: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.161153693218473 (code B ref 3860); Mon, 25 Jan 2021 01:09:02 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 25 Jan 2021 01:08:52 +0000 Original-Received: from localhost ([127.0.0.1]:37547 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3qNA-0004nn-C9 for submit@debbugs.gnu.org; Sun, 24 Jan 2021 20:08:52 -0500 Original-Received: from outgoing.fuhm.net ([45.79.218.44]:49778) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l3nzk-0001Dh-2y for 3860@debbugs.gnu.org; Sun, 24 Jan 2021 17:36:32 -0500 Original-Received: from localhost ([127.0.0.1] helo=fuhm.net) by torpor.static.net with esmtp (Exim 4.92) (envelope-from ) id 1l3nze-0006V1-VV; Sun, 24 Jan 2021 17:36:27 -0500 Original-Received: from 10.0.1.211 (SquirrelMail authenticated user jknight) by fuhm.net with HTTP; Sun, 24 Jan 2021 17:36:27 -0500 In-Reply-To: <87k0s66y57.fsf@gnus.org> X-Priority: 3 (Normal) Importance: Normal X-Mailman-Approved-At: Sun, 24 Jan 2021 20:08:47 -0500 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:198540 Archived-At: On Thu, January 21, 2021 11:41 am, Lars Ingebrigtsen wrote: > James Y Knight writes: > >> Hi, I recently just switched to from Emacs 21 to Emacs 22 (22.2.1, on >> Debian Lenny), and was a bit disappointed to discover that vc-svn is >> now automatically calling "svn resolved" on files when I save them >> after removing conflict markers. > > (I'm going through old bug reports that unfortunately got no response at > the time.) > > This behaviour still seems to be present in Emacs 28, as far as I can > see. > >> I use svn's list of conflicted files while working on merges, and tend >> to only call "resolved" on them when I'm *actually done* fixing a >> group of files. I'll note that emacs automatically calling "svn >> resolved" also destroys the .mine, .rOLD, and .rNEW files, which I >> wasn't actually done with yet. Having them disappear out from under me >> just because I've *partly* fixed things and saved is very >> counterintuitive! > > I haven't used SVN myself in ages, and I don't even recall what my work > flow used to be. However, adding a variable to suppress > `vc-svn-resolve-when-done' might make sense? Anybody who actually uses > SVN still got an opinion here? > > That this bug report is 11 years old and there doesn't seem to be any > other bug reports about this does perhaps indicate that people are fine > with how it works, and nothing should be done here. 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) 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...