[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el,v |
Date: |
Wed, 21 Nov 2007 04:56:00 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 07/11/21 04:55:58
Index: lisp/pcvs-parse.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/pcvs-parse.el,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- lisp/pcvs-parse.el 13 Aug 2007 10:41:40 -0000 1.32
+++ lisp/pcvs-parse.el 21 Nov 2007 04:55:56 -0000 1.33
@@ -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)) "/$")
- [Emacs-diffs] Changes to emacs/lisp/pcvs-parse.el,v,
Miles Bader <=