emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: cvs-examine fails


From: Stefan Monnier
Subject: Re: cvs-examine fails
Date: Sat, 27 Oct 2007 15:38:33 -0400
User-agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux)

> M-x cvs-examine
> fails with:

>    Running cvs update ...
>    error in process sentinel: image-type: Cannot determine image type
>    error in process sentinel: Cannot determine image type

These are message taken from *Messages*, right?
Can you try to enable "Options => Enter Debugger on Error" and reproduce
the problem?

And try the patch below which might fix it (stab in the dark),


        Stefan


--- orig/lisp/pcvs-parse.el
+++ mod/lisp/pcvs-parse.el
@@ -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)) "/$")






reply via email to

[Prev in Thread] Current Thread [Next in Thread]