diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/vc/vc-svn.el | 5 |
2 files changed, 5 insertions, 2 deletions
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 <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 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)) |