From: Glenn Morris Date: Thu, 20 Jan 2011 07:17:22 +0000 (-0800) Subject: * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change. X-Git-Tag: emacs-pretest-24.0.90~104^2~618^2~1322^2~188 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dbfb414e49a879b5d9086f54b67d02e11e445ec2;p=emacs.git * lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index aff58b8da21..c27b123d767 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-01-20 Glenn Morris + * 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 diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el index d0b6e3841fa..aef7bd23f68 100644 --- 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))