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: Thu, 21 Jan 2021 21:33:01 +0200 Message-ID: <835z3q6q6q.fsf@gnu.org> References: <87k0s66y57.fsf@gnus.org> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="1828"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 3860@debbugs.gnu.org, jknight@fuhm.net, spiegel@gnu.org To: Lars Ingebrigtsen Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 21 20:44:38 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 1l2fsk-0000MP-3B for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 20:44:38 +0100 Original-Received: from localhost ([::1]:35050 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2fsj-0008KH-2X for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 14:44:37 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:32932) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2fiU-0003oM-Vm for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 14:34:04 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47865) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2fiU-0008FS-JN for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 14:34:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2fiU-0007x3-Gs for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 14:34: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: Thu, 21 Jan 2021 19:34: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.161125759330508 (code B ref 3860); Thu, 21 Jan 2021 19:34:02 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 21 Jan 2021 19:33:13 +0000 Original-Received: from localhost ([127.0.0.1]:59411 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2fhh-0007w0-08 for submit@debbugs.gnu.org; Thu, 21 Jan 2021 14:33:13 -0500 Original-Received: from eggs.gnu.org ([209.51.188.92]:39534) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2fhf-0007vo-Bw for 3860@debbugs.gnu.org; Thu, 21 Jan 2021 14:33:11 -0500 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]:48640) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2fhZ-0007sa-Oh; Thu, 21 Jan 2021 14:33:05 -0500 Original-Received: from 84.94.185.95.cable.012.net.il ([84.94.185.95]:2554 helo=home-c4e4a596f7) by fencepost.gnu.org with esmtpsa (TLS1.2:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1l2fhY-0004tx-K9; Thu, 21 Jan 2021 14:33:05 -0500 In-Reply-To: <87k0s66y57.fsf@gnus.org> (message from Lars Ingebrigtsen on Thu, 21 Jan 2021 17:41:08 +0100) 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:198343 Archived-At: > From: Lars Ingebrigtsen > Date: Thu, 21 Jan 2021 17:41:08 +0100 > Cc: 3860@debbugs.gnu.org, spiegel@gnu.org > > > 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? 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.