mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Glenn Morris 2011-01-19 23:17:22 -08:00
parent e885315dd0
commit dbfb414e49
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lisp/vc/vc-svn.el
View file

@ -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))