1. xemacs
  2. pcl-cvs

Commits

steveb  committed b020a6f

fix backup file not found problem

  • Participants
  • Parent commits 9f32948
  • Branches default

Comments (0)

Files changed (3)

File ChangeLog

View file
  • Ignore whitespace
+1998-05-07  Greg Klanderman  <greg@alphatech.com>
+
+	* pcl-cvs.el (cvs-parse-stderr): handle not finding the
+	backup-file gracefully.
+	(cvs-parse-stdout): Ditto.
+
 1998-04-27  Greg Klanderman  <greg@alphatech.com>
 
 	* pcl-cvs.el (cvs-find-program): use decode-path-internal.

File Makefile

View file
  • Ignore whitespace
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.07
+VERSION = 1.08
 AUTHOR_VERSION =
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = pcl-cvs

File pcl-cvs.el

View file
  • Ignore whitespace
 	    (setq backup-file
 		  (cvs-find-backup-file filename current-dir))
 	    (setq backup-revision
-		  (cvs-find-backup-revision backup-file))
+		  (and backup-file (cvs-find-backup-revision backup-file)))
 
 	     ;; Was there a conflict during the merge?
 
 	      (setq backup-file
 		    (cvs-find-backup-file filename current-dir base-revision)
 		    backup-revision
-		    (cvs-find-backup-revision backup-file))
+		    (and backup-file (cvs-find-backup-revision backup-file)))
 	    (setq backup-file nil
 		  backup-revision nil))