[Emacs-diffs] /srv/bzr/emacs/trunk r102915: * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.

[Glenn Morris]

------------------------------------------------------------
revno: 102915
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Wed 2011-01-19 23:17:22 -0800
message:
  * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.
modified:
  lisp/ChangeLog
  lisp/vc/vc-svn.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-20 06:40:36 +0000
+++ b/lisp/ChangeLog    2011-01-20 07:17:22 +0000
@@ -1,5 +1,7 @@
 2011-01-20  Glenn Morris  <address@hidden>
 
+       * 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  <address@hidden>

=== modified file 'lisp/vc/vc-svn.el'
--- a/lisp/vc/vc-svn.el 2011-01-19 03:49:00 +0000
+++ b/lisp/vc/vc-svn.el 2011-01-20 07:17:22 +0000
@@ -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))