Mercurial > emacs
comparison lisp/vc/vc-svn.el @ 112386:4ce9a7be0488
* lisp/vc/vc-svn.el (vc-svn-after-dir-status): Tweak previous change.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Wed, 19 Jan 2011 23:17:22 -0800 |
| parents | 8fd096a52b28 |
| children |
comparison
equal
deleted
inserted
replaced
| 112385:5bc690b4522f | 112386:4ce9a7be0488 |
|---|---|
| 178 (goto-char (point-min)) | 178 (goto-char (point-min)) |
| 179 (while (re-search-forward re nil t) | 179 (while (re-search-forward re nil t) |
| 180 (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) | 180 (let ((state (cdr (assq (aref (match-string 1) 0) state-map))) |
| 181 (propstat (cdr (assq (aref (match-string 2) 0) state-map))) | 181 (propstat (cdr (assq (aref (match-string 2) 0) state-map))) |
| 182 (filename (match-string 4))) | 182 (filename (match-string 4))) |
| 183 (if (memq propstat '(conflict edited)) | 183 (and (memq propstat '(conflict edited)) |
| 184 (setq state propstat)) | 184 (not (eq state 'conflict)) ; conflict always wins |
| 185 (setq state propstat)) | |
| 185 (and remote (string-equal (match-string 3) "*") | 186 (and remote (string-equal (match-string 3) "*") |
| 186 ;; FIXME are there other possible combinations? | 187 ;; FIXME are there other possible combinations? |
| 187 (cond ((eq state 'edited) (setq state 'needs-merge)) | 188 (cond ((eq state 'edited) (setq state 'needs-merge)) |
| 188 ((not state) (setq state 'needs-update)))) | 189 ((not state) (setq state 'needs-update)))) |
| 189 (when (and state (not (string= "." filename))) | 190 (when (and state (not (string= "." filename))) |