From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: James Y Knight Newsgroups: gmane.emacs.bugs Subject: bug#3860: vc-svn calls "svn resolved" without permission Date: Wed, 15 Jul 2009 15:43:06 -0400 Message-ID: Reply-To: James Y Knight , 3860@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v935.3) Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1247719662 5863 80.91.229.12 (16 Jul 2009 04:47:42 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 16 Jul 2009 04:47:42 +0000 (UTC) To: spiegel@gnu.org, bug-gnu-emacs@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jul 16 06:47:25 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1MRIs2-0006mV-CD for geb-bug-gnu-emacs@m.gmane.org; Thu, 16 Jul 2009 06:47:02 +0200 Original-Received: from localhost ([127.0.0.1]:46511 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRIs1-0001Au-SF for geb-bug-gnu-emacs@m.gmane.org; Thu, 16 Jul 2009 00:47:01 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MRBEP-0001VX-RI for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:37:37 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MRBEK-0001NE-Fv for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:37:36 -0400 Original-Received: from [199.232.76.173] (port=51536 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRBEK-0001Mn-5N for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:37:32 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:59740) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MRBEJ-0005O1-0U for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:37:31 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n6FKbSam032003; Wed, 15 Jul 2009 13:37:28 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id n6FKU4Zm030453; Wed, 15 Jul 2009 13:30:04 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: James Y Knight Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Wed, 15 Jul 2009 20:30:03 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 3860 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.124768956429974 (code B ref -1); Wed, 15 Jul 2009 20:30:03 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 15 Jul 2009 20:26:04 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n6FKPv7L029953 for ; Wed, 15 Jul 2009 13:25:58 -0700 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MRB33-0008EA-Ir for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:25:53 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MRB2y-0008Be-Oq for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:25:52 -0400 Original-Received: from [199.232.76.173] (port=58279 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MRB2y-0008Bb-KB for bug-gnu-emacs@gnu.org; Wed, 15 Jul 2009 16:25:48 -0400 Original-Received: from 207-172-212-176.c3-0.smr-ubr2.sbo-smr.ma.static.cable.rcn.com ([207.172.212.176]:42252 helo=torpor.static.net) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1MRB2v-00039V-Ay; Wed, 15 Jul 2009 16:25:45 -0400 Original-Received: from ita4fw1.itasoftware.com ([63.107.91.99] helo=dc4-9dhcp19047.internal.itasoftware.com) by torpor.static.net with esmtpsa (TLS-1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.63) (envelope-from ) id 1MRANf-00049G-S6; Wed, 15 Jul 2009 15:43:09 -0400 X-Mailer: Apple Mail (2.935.3) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. X-Greylist: delayed 2554 seconds by postgrey-1.27 at monty-python; Wed, 15 Jul 2009 16:25:44 EDT X-Greylist: delayed 2555 seconds by postgrey-1.27 at monty-python; Wed, 15 Jul 2009 16:25:45 EDT X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Wed, 15 Jul 2009 16:37:36 -0400 X-Mailman-Approved-At: Thu, 16 Jul 2009 00:45:23 -0400 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:29461 Archived-At: 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 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! There's a reason that svn makes you run "svn resolved" on files to note them as resolved instead of just checking for the lack of conflict markers, and vc-svn is totally destroying that nice behavior of svn. If it was a good idea to autoresolve when there's no conflict marker in the file, then "svn commit" would already do that! IMO, the function "vc-svn-resolve-when-done" should just be removed entirely. But if not, it really should *at least* be asking for confirmation first before causing the merge working data to be deleted. Relatedly, it would also be great if there was a key to run svn resolved. I've had this addition in my .emacs for a while to achieve that: (defun svn-resolved () "Resolve conflict on current buffer" (interactive) (shell-command (concat "svn resolved " (buffer-file-name)))) (define-key 'vc-prefix-map "R" 'svn-resolved) James