From 1e98637e4160e22fd4f70a0f2fa0c35730540372 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Wed, 7 Mar 2001 00:17:53 +0000 Subject: [PATCH] (cvs-parse-table): Add another ignored message. --- lisp/pcvs-parse.el | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 34caaec13d8..036837c3bcb 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -4,7 +4,7 @@ ;; Author: Stefan Monnier ;; Keywords: pcl-cvs -;; Revision: $Id: pcvs-parse.el,v 1.4 2000/12/06 19:52:39 fx Exp $ +;; Revision: $Id: pcvs-parse.el,v 1.5 2000/12/18 03:17:31 monnier Exp $ ;; This file is part of GNU Emacs. @@ -25,6 +25,12 @@ ;;; Commentary: +;;; Bugs: + +;; - when merging a modified file, if the merge says that the file already +;; contained in the changes, it marks the file as `up-to-date' although +;; it might still contain further changes. +;; Example: merging a zero-change commit. ;;; Code: @@ -352,6 +358,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." (cvs-match "refetching unpatchable files$") ;; [commit] (cvs-match "Rebuilding administrative file database$") + ;; ??? + (cvs-match "--> Using per-directory sticky tag `.*'") ;; CVS is running a *info program. (and @@ -408,6 +416,8 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." "\\) already contains the differences between .*$") (path 1) (type '(UP-TO-DATE . MERGED))) t) + ;; FIXME: PATH might not be set yet. Sometimes the only path + ;; information is in `RCS file: ...' (yuck!!). (cvs-parsed-fileinfo (if dont-change-disc 'NEED-MERGE (or type '(MODIFIED . MERGED))) path nil :merge (cons base-rev head-rev)))))) -- 2.39.5