# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1016398094 0
# Node ID 36f11755a3d6bf81caecfcb004461ce491072be3
# Parent  7e66682c7ec6553660cd8207306d6cc3621007ff
(cvs-parse-table): Be a bit more lenient.
(cvs-parse-status): Handle the "used to have a conflict" marker.

diff -r 7e66682c7ec6 -r 36f11755a3d6 lisp/pcvs-parse.el
--- a/lisp/pcvs-parse.el	Sun Mar 17 20:37:10 2002 +0000
+++ b/lisp/pcvs-parse.el	Sun Mar 17 20:48:14 2002 +0000
@@ -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 @@
 
      ;; 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 @@
 		 (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))