diff options
Diffstat (limited to 'lisp/pcvs-parse.el')
| -rw-r--r-- | lisp/pcvs-parse.el | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el index 3ca1829030f..61ee7b4bea2 100644 --- a/lisp/pcvs-parse.el +++ b/lisp/pcvs-parse.el @@ -235,7 +235,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; 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 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; 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)) "/$") @@ -301,7 +302,7 @@ The remaining KEYS are passed directly to `cvs-create-fileinfo'." ;; [add] this will also show up as a `U <file>' (and - (cvs-match "\\(.*\\), version \\(.*\\), resurrected$" + (cvs-match "`?\\(.*?\\)'?, version \\(.*\\), resurrected$" (path 1) (base-rev 2)) ;; FIXME: resurrection only brings back the original version, ;; not the latest on the branch, so `up-to-date' is not always |