Mercurial > emacs
changeset 79433:855c06f0c064
(cvs-parse-table): Ignore errors when looking up files
in order to determine if there's a conflict.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Fri, 16 Nov 2007 03:16:32 +0000 |
| parents | 53fe0e6aa508 |
| children | ced2db270723 |
| files | lisp/ChangeLog lisp/pcvs-parse.el |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Nov 16 01:28:43 2007 +0000 +++ b/lisp/ChangeLog Fri Nov 16 03:16:32 2007 +0000 @@ -1,3 +1,8 @@ +2007-11-16 Stefan Monnier <monnier@iro.umontreal.ca> + + * pcvs-parse.el (cvs-parse-table): Ignore errors when looking up files + in order to determine if there's a conflict. + 2007-11-16 Juri Linkov <juri@jurta.org> * man.el (Man-heading-regexp): Add 0-9. @@ -30,8 +35,8 @@ 2007-11-14 Jason Rumney <jasonr@gnu.org> - * international/mule-cmds.el (set-locale-environment): Set - default-file-name-coding-system from system defaults on Windows. + * international/mule-cmds.el (set-locale-environment): + Set default-file-name-coding-system from system defaults on Windows. 2007-11-14 Nick Roberts <nickrob@snap.net.nz>
--- 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)) "/$")