From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#3860: vc-svn calls "svn resolved" without permission Date: Thu, 21 Jan 2021 17:41:08 +0100 Message-ID: <87k0s66y57.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="9166"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 3860@debbugs.gnu.org, spiegel@gnu.org To: James Y Knight Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jan 21 17:42:45 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 1l2d2j-0002FG-7S for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 17:42:45 +0100 Original-Received: from localhost ([::1]:33760 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l2d2i-0006HK-4e for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 21 Jan 2021 11:42:44 -0500 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46866) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l2d22-0006Gy-98 for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 11:42:02 -0500 Original-Received: from debbugs.gnu.org ([209.51.188.43]:47658) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1l2d22-0007Ob-1A for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 11:42:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1l2d21-0001fC-VK for bug-gnu-emacs@gnu.org; Thu, 21 Jan 2021 11:42:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 21 Jan 2021 16:42:01 +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.16112472816335 (code B ref 3860); Thu, 21 Jan 2021 16:42:01 +0000 Original-Received: (at 3860) by debbugs.gnu.org; 21 Jan 2021 16:41:21 +0000 Original-Received: from localhost ([127.0.0.1]:59201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2d1N-0001e7-8g for submit@debbugs.gnu.org; Thu, 21 Jan 2021 11:41:21 -0500 Original-Received: from quimby.gnus.org ([95.216.78.240]:59402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1l2d1K-0001dr-QL for 3860@debbugs.gnu.org; Thu, 21 Jan 2021 11:41:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=QrvDc9MDFVLXix8nXLLfrz761UjVl8ptS/p2mYLQ0Ao=; b=mgMgV0sqVGyCiek2lT0m2ukT4x 7kd8HueDrEdGA8a/1gglIwiVKuBOAkWKqwzycdg4pTIwfU1Q3SzvaFy8jWFwysrg88a8UyUpO+CBq 3CePGAa/+tToICgM0/OhNycP9FeZJ9WPsn/435SmTyg5jEoW86sE3CKTKlPmg0Ys1iuQ=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1l2d1B-00070L-JL; Thu, 21 Jan 2021 17:41:11 +0100 X-Now-Playing: Voice Farm's _Third Noise Principle (Formative North American Electronica 1975-1984) (1)_: "AM City" In-Reply-To: (James Y. Knight's message of "Wed, 15 Jul 2009 15:43:06 -0400") 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:198326 Archived-At: 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. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no