Mercurial > emacs
comparison lisp/vc-bzr.el @ 93164:849abb573acb
(vc-bzr-state): Return 'removed for removed files and
'unregistered for unregistered files.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Sun, 23 Mar 2008 20:50:52 +0000 |
| parents | 01d3fd1a2cfe |
| children | c985261aee9c |
comparison
equal
deleted
inserted
replaced
| 93163:521810ff0616 | 93164:849abb573acb |
|---|---|
| 225 (cdr (assq (car result) | 225 (cdr (assq (car result) |
| 226 '((added . added) | 226 '((added . added) |
| 227 (kindchanged . edited) | 227 (kindchanged . edited) |
| 228 (renamed . edited) | 228 (renamed . edited) |
| 229 (modified . edited) | 229 (modified . edited) |
| 230 (removed . edited) | 230 (removed . removed) |
| 231 (ignored . nil) | 231 (ignored . unregistered) |
| 232 (unknown . nil) | 232 (unknown . unregistered) |
| 233 (unchanged . up-to-date))))))) | 233 (unchanged . up-to-date))))))) |
| 234 | 234 |
| 235 (defun vc-bzr-resolve-when-done () | 235 (defun vc-bzr-resolve-when-done () |
| 236 "Call \"bzr resolve\" if the conflict markers have been removed." | 236 "Call \"bzr resolve\" if the conflict markers have been removed." |
| 237 (save-excursion | 237 (save-excursion |