* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aff58b8da21fc7982a03f4d7c5ea6e0fddda5ffe..c27b123d76748a815d321600a0ae06b23c5eddd4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index d0b6e3841fa24ff1bbf8416c782c07918bb0ee47..aef7bd23f68e595039a2f87d9f79f5e56c9c9d33 100644 (file)
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -180,8 +180,9 @@ want to force an empty list of arguments, use t."
       (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))