251 |
|
|
252 |
;; A special cvs message |
;; A special cvs message |
253 |
(and |
(and |
254 |
(cvs-match "cvs[.ex]* [a-z]+: ") |
(let ((case-fold-search t)) |
255 |
|
(cvs-match "cvs[.a-z]* [a-z]+: ")) |
256 |
(cvs-or |
(cvs-or |
257 |
|
|
258 |
;; CVS is descending a subdirectory |
;; CVS is descending a subdirectory |
436 |
(type (if nofile 'MISSING 'NEED-UPDATE))) |
(type (if nofile 'MISSING 'NEED-UPDATE))) |
437 |
(cvs-match "Up-to-date$" |
(cvs-match "Up-to-date$" |
438 |
(type (if nofile '(UP-TO-DATE . REMOVED) 'UP-TO-DATE))) |
(type (if nofile '(UP-TO-DATE . REMOVED) 'UP-TO-DATE))) |
439 |
|
(cvs-match "File had conflicts on merge$" (type 'MODIFIED)) |
440 |
(cvs-match ".*[Cc]onflict.*$" (type 'CONFLICT)) |
(cvs-match ".*[Cc]onflict.*$" (type 'CONFLICT)) |
441 |
(cvs-match "Locally Added$" (type 'ADDED)) |
(cvs-match "Locally Added$" (type 'ADDED)) |
442 |
(cvs-match "Locally Removed$" (type 'REMOVED)) |
(cvs-match "Locally Removed$" (type 'REMOVED)) |