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

[bpt/emacs.git] / lisp / vc / vc-svn.el

diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index d0b6e38..aef7bd2 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))