diff lisp/pcvs-parse.el @ 79433:855c06f0c064

(cvs-parse-table): Ignore errors when looking up files in order to determine if there's a conflict.

--- a/lisp/pcvs-parse.el	Fri Nov 16 01:28:43 2007 +0000
+++ b/lisp/pcvs-parse.el	Fri Nov 16 03:16:32 2007 +0000
@@ -235,7 +235,7 @@
 	      ;; servers, this should not be necessary, because they return
 	      ;; a complete merge output.
 	      (with-temp-buffer
-		(insert-file-contents path)
+		(ignore-errors (insert-file-contents path))
 		(goto-char (point-min))
 		(if (re-search-forward "^<<<<<<< " nil t)
 		    'CONFLICT 'NEED-MERGE))))
@@ -272,8 +272,9 @@
 	;; branches, or because it's been removed).
 	(if (ignore-errors
 	      (with-temp-buffer
-		(insert-file-contents (expand-file-name
-				       ".cvsignore" (file-name-directory dir)))
+                (ignore-errors
+                  (insert-file-contents
+                   (expand-file-name ".cvsignore" (file-name-directory dir))))
 		(goto-char (point-min))
 		(re-search-forward
 		 (concat "^" (regexp-quote (file-name-nondirectory dir)) "/$")