diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-03-17 20:48:14 +0000 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2002-03-17 20:48:14 +0000 |
| commit | 08dbd869346e0afd01b6eb0913205ab6e5e49357 (patch) | |
| tree | f3e92e3117bf4290e17aa6c027bc49ce721ec3d3 /lisp/pcvs-parse.el | |
| parent | e9084499a91960b01af51cc1ed9d91724741cf01 (diff) | |
| download | emacs-08dbd869346e0afd01b6eb0913205ab6e5e49357.tar.gz | |
(cvs-parse-table): Be a bit more lenient.
(cvs-parse-status): Handle the "used to have a conflict" marker.
Diffstat (limited to 'lisp/pcvs-parse.el')
| -rw-r--r-- | lisp/pcvs-parse.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 56316545b8e..bc577d6e8c8 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier <monnier@cs.yale.edu> ;; Keywords: pcl-cvs -;; Revision: $Id: pcvs-parse.el,v 1.9 2001/09/22 20:22:34 monnier Exp $ +;; Revision: $Id: pcvs-parse.el,v 1.10 2001/09/24 16:39:23 monnier Exp $ ;; This file is part of GNU Emacs. @@ -251,7 +251,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; A special cvs message (and - (cvs-match "cvs[.ex]* [a-z]+: ") + (let ((case-fold-search t)) + (cvs-match "cvs[.a-z]* [a-z]+: ")) (cvs-or ;; CVS is descending a subdirectory @@ -435,6 +436,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (type (if nofile 'MISSING 'NEED-UPDATE))) (cvs-match "Up-to-date$" (type (if nofile '(UP-TO-DATE . REMOVED) 'UP-TO-DATE))) + (cvs-match "File had conflicts on merge$" (type 'MODIFIED)) (cvs-match ".*[Cc]onflict.*$" (type 'CONFLICT)) (cvs-match "Locally Added$" (type 'ADDED)) (cvs-match "Locally Removed$" (type 'REMOVED)) |