From: Chris Hanson <org/chris-hanson/cph>
Date: Wed, 2 Apr 1997 08:17:13 +0000 (+0000)
Subject: Don't barf when a "branch" field appears in the admin block.
X-Git-Tag: 20090517-FFI~5221
X-Git-Url: https://birchwood-abbey.net/git?a=commitdiff_plain;h=41974bc7a037bcddb4f0cc0f87b12cef730f55e6;p=mit-scheme.git

Don't barf when a "branch" field appears in the admin block.
---

diff --git a/v7/src/edwin/rcsparse.scm b/v7/src/edwin/rcsparse.scm
index c1c577fae..fcef1b1fe 100644
--- a/v7/src/edwin/rcsparse.scm
+++ b/v7/src/edwin/rcsparse.scm
@@ -1,8 +1,8 @@
 #| -*-Scheme-*-
 
-$Id: rcsparse.scm,v 1.1 1994/03/08 20:30:55 cph Exp $
+$Id: rcsparse.scm,v 1.2 1997/04/02 08:17:13 cph Exp $
 
-Copyright (c) 1991-94 Massachusetts Institute of Technology
+Copyright (c) 1991-97 Massachusetts Institute of Technology
 
 This material was developed by the Scheme project at the Massachusetts
 Institute of Technology, Department of Electrical Engineering and
@@ -65,7 +65,7 @@ MIT in each case. |#
 	(make-rcs-admin (and head (num->delta head))
 			(and branch
 			     (not (null? (cdr branch)))
-			     (num->delta (rcs-num-string (cadr branch))))
+			     (rcs-num-string (cadr branch)))
 			(map rcs-id-string (cdr access-list))
 			(rcs-id-alist (cdr symbols))
 			(rcs-id-alist (cdr locks))
@@ -222,7 +222,8 @@ MIT in each case. |#
 		      (if (fix:= n-fields i)
 			  (last-revision branch)
 			  (loop branch i))))))))
-      (or (rcs-admin/branch admin)
+      (if (rcs-admin/branch admin)
+	  (rcs-find-delta admin (rcs-admin/branch admin))
 	  (rcs-admin/head admin))))
 
 (define (last-revision delta)