# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1295507842 28800
# Node ID 4ce9a7be048866b590e9cf66c0178c91c19ab40f
# Parent  5bc690b4522fb3d31fcec3c5b3b6c34a9e989ebf
* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.

diff -r 5bc690b4522f -r 4ce9a7be0488 lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Jan 20 07:43:04 2011 +0100
+++ b/lisp/ChangeLog	Wed Jan 19 23:17:22 2011 -0800
@@ -1,5 +1,7 @@
 2011-01-20  Glenn Morris  <rgm@gnu.org>
 
+	* vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.
+
 	* simple.el (read-expression-history): Remove, it's in minibuf.c.
 
 2011-01-20  Chong Yidong  <cyd@stupidchicken.com>
diff -r 5bc690b4522f -r 4ce9a7be0488 lisp/vc/vc-svn.el
--- a/lisp/vc/vc-svn.el	Thu Jan 20 07:43:04 2011 +0100
+++ b/lisp/vc/vc-svn.el	Wed Jan 19 23:17:22 2011 -0800
@@ -180,8 +180,9 @@
       (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
             (propstat (cdr (assq (aref (match-string 2) 0) state-map)))
 	    (filename (match-string 4)))
-        (if (memq propstat '(conflict edited))
-            (setq state propstat))
+        (and (memq propstat '(conflict edited))
+             (not (eq state 'conflict)) ; conflict always wins
+             (setq state propstat))
 	(and remote (string-equal (match-string 3) "*")
 	     ;; FIXME are there other possible combinations?
 	     (cond ((eq state 'edited) (setq state 'needs-merge))