Commit dbfb414e authored by Glenn Morris's avatar Glenn Morris
Browse files

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

parent e885315d
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>
......
......@@ -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))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment