From owner-freebsd-current  Sun Dec  8 08:46:39 1996
Return-Path: <owner-current>
Received: (from root@localhost)
          by freefall.freebsd.org (8.8.4/8.8.4) id IAA16909
          for current-outgoing; Sun, 8 Dec 1996 08:46:39 -0800 (PST)
Received: from ylana.vet.purdue.edu (vet.vet.purdue.edu [128.210.96.50])
          by freefall.freebsd.org (8.8.4/8.8.4) with ESMTP id IAA16897
          for <current@FreeBSD.ORG>; Sun, 8 Dec 1996 08:46:31 -0800 (PST)
Received: from ylana.vet.purdue.edu (localhost.vet.purdue.edu [127.0.0.1]) by ylana.vet.purdue.edu (8.8.3/8.7.3) with ESMTP id LAA23662 for <current@FreeBSD.ORG>; Sun, 8 Dec 1996 11:24:59 -0500 (EST)
Message-Id: <199612081624.LAA23662@ylana.vet.purdue.edu>
X-Mailer: exmh version 1.6.9 8/22/96
To: current@FreeBSD.ORG
Subject: ctm delta src-cur.2484.gz mangled?
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Date: Sun, 08 Dec 1996 11:24:58 -0500
From: Benjamin Lewis <blewis@vet.purdue.edu>
Sender: owner-current@FreeBSD.ORG
X-Loop: FreeBSD.org
Precedence: bulk

Hi,

I'm having trouble applying ctm delta src-cur.2484.gz:

	ylana:/usr/src [143]#ctm -v -v ctms/src-cur.2484.gz
	Working on <ctms/src-cur.2484.gz>
	Expecting Global MD5 <050901836fc100ca56044c7706b85623>
	Reference Global MD5 <050901836fc100ca56044c7706b85623>
	  FN: share/doc/handbook/contrib.sgml md5 mismatch.
	  FN: share/doc/handbook/contrib.sgml edit fails.
	Exit(104)

I know for a fact that I've never modified share/doc/handbook/contrib.sgml,
but just in case there was bit-rot or something, I created a virgin src/
tree from the src-cur.2400A.gz base delta, and applied every delta to it,
with the same results for #2484.

Is there anything I can do about this? It looks like I can tell ctm to 
ignore contrib.sgml, but then I'd never be able to update that file 
again, right (without grabbing another base delta)?

This sort of thing seems to happen every time we get close to another 
base delta, and in the past I've just waited for and downloaded the next 
base delta.  However, this seems to defeat the point of deltas entirely, 
as I end up ftping a 40MB file every 100 deltas.  Might as well just skip 
the deltas all together, eh?

Here's the output of ctm -V 4, just in case it's useful:

	ylana:/usr/src [156]#ctm -V 4 ctms/src-cur.2484.gz
	Working on <ctms/src-cur.2484.gz>
	Pass1 -- Checking integrity of incoming CTM-patch
	<CTM_BEGIN>
	<2.0>
	<src-cur>
	<2484>
	<19961207035439Z>
	<.>
	<CTMFS>
	<.ctm_status>
	<0>
	<0>
	<644>
	<033bb9da025d22edfc6652084340370c>
	<fff57090ce63b9f90a29fcab77d074c8>
	<13>
	<CTMFN>
	<gnu/libexec/uucp/common_sources/policy.h>
	<0>
	<0>
	<644>
	<488ebd4498a977ac9f1096f9a499f4ed>
	<6c8c6261294fc734c6b6a909ffcd5155>
	<42>
	<CTMFN>
	<lib/libc/sys/setuid.2>
	<0>
	<0>
	<644>
	<4981450b46bbeb0346c2a13507d2ab28>
	<42bcdccaec390221d57e3c12af702bd4>
	<755>
	<CTMFN>
	<share/doc/handbook/contrib.sgml>
	<0>
	<0>
	<644>
	<8748e9e48254d5fb48099abcf118eb3e>
	<277e4132096aa9213805a647528886b0>
	<209>
	<CTMFN>
	<share/doc/ja_JP.EUC/handbook/authors.sgml>
	<0>
	<0>
	<644>
	<1247fd3171e99fbbfdf21a03a9b12a58>
	<da524332b40149a82a56b88c84f6b0bc>
	<239>
	<CTMFN>
	<sys/sys/unistd.h>
	<0>
	<0>
	<644>
	<6ba3d5e778fbdc9e5203909c3333e576>
	<4bd20c78ef1a8f456883cf25eb583135>
	<157>
	<CTMFN>
	<sys/vm/vm_map.c>
	<0>
	<0>
	<644>
	<6e45127ccaec8aeb8f6b969c8ea08f17>
	<261b55949a6dfbf25d2d6e5a83a0c0cc>
	<1033>
	<CTMFN>
	<sys/vm/vm_map.h>
	<0>
	<0>
	<644>
	<3c696fde00ac0dd4d15938729e875b5e>
	<ec25fba94221f3e03a04d316b5a04d6a>
	<128>
	<CTM_END>
	Expecting Global MD5 <050901836fc100ca56044c7706b85623>
	<050901836fc100ca56044c7706b85623>
	Reference Global MD5 <050901836fc100ca56044c7706b85623>
	Pass2 -- Checking if CTM-patch will apply
	<CTM_BEGIN>
	<2.0>
	<src-cur>
	<2484>
	<19961207035439Z>
	<.>
	<CTMFS>
	<.ctm_status>
	<0>
	<0>
	<644>
	<033bb9da025d22edfc6652084340370c>
	<fff57090ce63b9f90a29fcab77d074c8>
	<13>
	<CTMFN>
	<gnu/libexec/uucp/common_sources/policy.h>
	<0>
	<0>
	<644>
	<488ebd4498a977ac9f1096f9a499f4ed>
	<6c8c6261294fc734c6b6a909ffcd5155>
	<42>
	<CTMFN>
	<lib/libc/sys/setuid.2>
	<0>
	<0>
	<644>
	<4981450b46bbeb0346c2a13507d2ab28>
	<42bcdccaec390221d57e3c12af702bd4>
	<755>
	<CTMFN>
	<share/doc/handbook/contrib.sgml>
	<0>
	<0>
	<644>
	<8748e9e48254d5fb48099abcf118eb3e>
	  FN: share/doc/handbook/contrib.sgml md5 mismatch.
	<277e4132096aa9213805a647528886b0>
	<209>
	  FN: share/doc/handbook/contrib.sgml edit fails.
	Exit(104)

Thanks,

-Ben


-- 
                   |  ". . .and Blundell is doing very well in sixth position  
Benjamin Lewis     |   . . .in fact he's lapping 2.5 seconds faster than       
bhlewis@purdue.edu |   Blundell who is in fifth position"                      
                   |    -- Murray Walker