Author: mattiase
Date: Sat Nov 19 13:34:10 2011
New Revision: 1203977
URL: http://svn.apache.org/viewvc?rev=1203977&view=rev
Log:
Handle the E (Existed) code when updating, making the status buffer a little
prettier.
* contrib/client-side/emacs/dsvn.el
(svn-update-flag-name, svn-update-filter): Recognize E as Existed.
Modified:
subversion/trunk/contrib/client-side/emacs/dsvn.el
Modified: subversion/trunk/contrib/client-side/emacs/dsvn.el
URL:
http://svn.apache.org/viewvc/subversion/trunk/contrib/client-side/emacs/dsvn.el?rev=1203977&r1=1203976&r2=1203977&view=diff
==============================================================================
--- subversion/trunk/contrib/client-side/emacs/dsvn.el (original)
+++ subversion/trunk/contrib/client-side/emacs/dsvn.el Sat Nov 19 13:34:10 2011
@@ -1161,7 +1161,8 @@ With prefix arg, prompt for REVISION."
(?D . "Deleted")
(?U . "Updated")
(?G . "Merged")
- (?C . "Conflict")))
+ (?C . "Conflict")
+ (?E . "Existed")))
(defvar svn-merging nil)
@@ -1189,7 +1190,7 @@ With prefix arg, prompt for REVISION."
(goto-char svn-output-marker)
(while (not nomore)
(cond ((looking-at
- "\\([ ADUCG][ ADUCG][ B]\\) \\(.*\\)\n")
+ "\\([ ADUCGE][ ADUCGE][ B]\\) \\(.*\\)\n")
(let* ((status (match-string 1))
(file-status (elt status 0))
(prop-status (elt status 1))
