From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bob Rogers Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#3213: 23.0.92; vc-svn-parse-status doesn't recognize deleted files Date: Mon, 4 May 2009 18:14:12 -0400 (EDT) Message-ID: <20090504221412.145794862E@rgr.rgrjr.com> Reply-To: Bob Rogers , 3213@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org X-Trace: ger.gmane.org 1241476364 22852 80.91.229.12 (4 May 2009 22:32:44 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 4 May 2009 22:32:44 +0000 (UTC) To: emacs-pretest-bug@gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue May 05 00:32:15 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 1M16hq-0008DY-E3 for geb-bug-gnu-emacs@m.gmane.org; Tue, 05 May 2009 00:32:14 +0200 Original-Received: from localhost ([127.0.0.1]:60029 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M16hp-0005fF-IZ for geb-bug-gnu-emacs@m.gmane.org; Mon, 04 May 2009 18:32:13 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1M16hl-0005dx-I8 for bug-gnu-emacs@gnu.org; Mon, 04 May 2009 18:32:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1M16hg-0005aJ-VV for bug-gnu-emacs@gnu.org; Mon, 04 May 2009 18:32:08 -0400 Original-Received: from [199.232.76.173] (port=54702 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1M16hg-0005aG-NB for bug-gnu-emacs@gnu.org; Mon, 04 May 2009 18:32:04 -0400 Original-Received: from mx20.gnu.org ([199.232.41.8]:63200) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1M16hg-0004AX-44 for bug-gnu-emacs@gnu.org; Mon, 04 May 2009 18:32:04 -0400 Original-Received: from rzlab.ucr.edu ([138.23.92.77]) by mx20.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M16he-0001iN-Lw for bug-gnu-emacs@gnu.org; Mon, 04 May 2009 18:32:02 -0400 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n44MVrij031554; Mon, 4 May 2009 15:31:54 -0700 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.13.8/8.13.8/Submit) id n44MK3Y2027650; Mon, 4 May 2009 15:20:03 -0700 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Bob Rogers Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs Resent-Date: Mon, 04 May 2009 22:20:03 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: report 3213 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by submit@emacsbugs.donarmstrong.com id=B.124147526426244 (code B ref -1); Mon, 04 May 2009 22:20:03 +0000 Original-Received: (at submit) by emacsbugs.donarmstrong.com; 4 May 2009 22:14:24 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from fencepost.gnu.org (fencepost.gnu.org [140.186.70.10]) by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n44MEHrJ026236 for ; Mon, 4 May 2009 15:14:19 -0700 Original-Received: from mx10.gnu.org ([199.232.76.166]:34693) by fencepost.gnu.org with esmtp (Exim 4.67) (envelope-from ) id 1M16QT-0007W6-4w for emacs-pretest-bug@gnu.org; Mon, 04 May 2009 18:14:17 -0400 Original-Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1M16QQ-0008Jd-Ve for emacs-pretest-bug@gnu.org; Mon, 04 May 2009 18:14:17 -0400 Original-Received: from rgrjr.com ([216.146.47.5]:42799) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1M16QQ-0008JU-LC for emacs-pretest-bug@gnu.org; Mon, 04 May 2009 18:14:14 -0400 Original-Received: from rgrjr.dyndns.org (c-66-30-196-77.hsd1.ma.comcast.net [66.30.196.77]) by rgrjr.com (Postfix on CentOS) with ESMTP id 2424A16011E for ; Mon, 4 May 2009 22:14:14 +0000 (UTC) Original-Received: (qmail 15173 invoked by uid 89); 4 May 2009 22:14:13 -0000 Original-Received: from unknown (HELO rgr.rgrjr.com) (192.168.57.1) by home with SMTP; 4 May 2009 22:14:13 -0000 Original-Received: by rgr.rgrjr.com (Postfix, from userid 500) id 145794862E; Mon, 4 May 2009 18:14:12 -0400 (EDT) X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 3) X-Detected-Operating-System: by mx20.gnu.org: GNU/Linux 2.6 (newer, 3) X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Resent-Date: Mon, 04 May 2009 18:32:08 -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:27691 gmane.emacs.pretest.bugs:24378 Archived-At: To reproduce: 1. "emacs -Q" in a Subversion working copy (I'm using a 1.5.0 client). 2. "C-x v d" to get in to VC dir mode. 3. Flag any file for removal via M-x vc-delete-file. The deleted file will show up in the VC dir window as "edited" rather than removed (and can be reverted afterwards). This seems to be a simple case of failing to recognize "D" as meaning deletion in vc-svn-parse-status; it only knows about "R". The patch below adds "D" as a synonym, as I assume "R" is still necessary for compatibility with older versions of Subversion. (Though if SVN ever did use "R", I don't remember it.) -- Bob Rogers http://www.rgrjr.com/ ------------------------------------------------------------------------ Index: lisp/vc-svn.el =================================================================== RCS file: /sources/emacs/emacs/lisp/vc-svn.el,v retrieving revision 1.113 diff -c -r1.113 vc-svn.el *** lisp/vc-svn.el 15 Apr 2009 00:32:51 -0000 1.113 --- lisp/vc-svn.el 4 May 2009 21:59:32 -0000 *************** *** 662,668 **** 'edited)) ((eq status ?I) (vc-file-setprop file 'vc-state 'ignored)) ! ((eq status ?R) (vc-file-setprop file 'vc-state 'removed)) (t 'edited))))) (when filename (vc-file-getprop filename 'vc-state)))) --- 662,668 ---- 'edited)) ((eq status ?I) (vc-file-setprop file 'vc-state 'ignored)) ! ((memq status '(?D ?R)) (vc-file-setprop file 'vc-state 'removed)) (t 'edited))))) (when filename (vc-file-getprop filename 'vc-state)))) ------------------------------------------------------------------------ In GNU Emacs 23.0.92.1 (i686-pc-linux-gnu, GTK+ Version 2.12.9) of 2009-04-24 on rgr Windowing system distributor `The X.Org Foundation', version 11.0.10400090 Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: VM Minor modes in effect: mc-read-mode: t diff-auto-refine-mode: t shell-dirtrack-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t Recent input: e v e r t SPC f o o M-p M-p M-p M-p s v n SPC d i f f SPC l i s p - M-b - M-b c v s SPC M-f C-f C-f u SPC c SPC C-e / v c - s v C-x o C-u C-u C-n C-c C-c C-e C-M-b ( o C-r m e m q C-r C-u C-SPC C-f m C-f m M-f M-f C-f ' ( M-f SPC ? R ) C-e C-M-b C-M-f C-M-f C-e C-M-b C-M-b C-M-f C-M-f C-c C-c C-x C-s M-p M-p C-_ C-x C-b C-n d C-n C-n SPC C-e C-M-b ( m e m b q SPC M-d M-f SPC ' ( R ? R M-t C-e ) C-c C-c C-M-b C-M-f C-M-f C-e C-M-b C-M-b C-M-f C-M-f C-x d g q C-x C-s C-x d g p p B SPC g g q q C-_ p w d s r c / e m a SPC - Q SPC ~ / p r o t e s 2 / t e f o s v n SPC s t a t s v n SPC s t a t s v n SPC r e v e r t SPC f o M-p M-p M-p M-p C-x C-b C-s * m a i C-a SPC M-< C-n C-n C-e s v c C-n C-n C-n C-n M-> C-w C-x k C-x b e m M-x v c e r e p o r Recent messages: Partially completed Completed Partially completed Completed History item: 1 History item: 2 History item: 3 History item: 4 Mark saved where search started Mark set [2 times]