From xemacs-m  Thu Mar 20 19:16:49 1997
Received: from susan.logware.de (root@susan.logware.de [192.109.80.15])
	by xemacs.org (8.8.5/8.8.5) with SMTP id TAA27835
	for <xemacs-beta@xemacs.org>; Thu, 20 Mar 1997 19:16:47 -0600 (CST)
Received: by susan.logware.de (Smail3.1.29.1)
	  id <m0w7swm-000024C>; Fri, 21 Mar 97 02:16 MET
Message-Id: <m0w7swm-000024C@susan.logware.de>
Date: Fri, 21 Mar 97 02:16 MET
From: Michael Diers <mdiers@logware.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
To: XEmacs beta list <xemacs-beta@xemacs.org>
Subject: [19.15-b101] patch: pcl-cvs.el

This fixes the pcl-cvs parser to recognize additional patch(1)
error/informational messages one might see with CVS 1.9 in
client/server mode.

It supersedes the patch against b99 I posted a few days ago.

-Michael


--- pcl-cvs.el	1997/03/19 13:01:29	1.1
+++ pcl-cvs.el	1997/03/21 01:04:00
@@ -1410,6 +1410,13 @@
 		(setcdr head (list fileinfo))
 		(setq head (cdr head)))))))
 
+         ;; Patch failure message with CVS client.
+         ;; Ignore, since a failed patch implies that the file proper
+         ;; subsequently will be fetched from the server.
+	 ((looking-at
+	   "^[0-9]+ out of [0-9]+ hunks failed--saving rejects to ")
+	  (forward-line 1))
+
 	 ;; Error messages from CVS (incomplete)
 
 	 ((looking-at
@@ -1533,6 +1540,13 @@
 	;; program prints anything to stderr.
 	(re-search-forward cvs-update-prog-output-skip-regexp)
 	(forward-line 1))
+
+       ;; Patch informational message with CVS client.
+       ;; Ignore, since this simply tells us that the patch in question
+       ;; already has been applied to the file.
+       ((looking-at
+	 "^.* already contains the differences between .* and ")
+        (forward-line 1))
 
        (t
 	(cvs-parse-error stdout-buffer stderr-buffer 'STDOUT (point)

