svn-cur

[Stephen Montgomery-Smith]

On 10/21/2012 06:09 PM, Stephen Montgomery-Smith wrote:
> On 10/21/2012 05:57 PM, Julian H. Stacey wrote:
>> DRAFT
>>
>>>> Do you mind if I put your patch on the CTM ftp sites?  [...]
>>>
>>> No problem. Feel free to distribute the patch by any means you like.
>>
>> Hi all,
>> With this
>>   8.[23]-RELEASE amd64
>>   MD5 (svn-cur.00500xEmpty.xz) = a9245484b4996f1cf411feb691686efc
>>   MD5 (svn-cur.00800xEmpty.xz) = 4163ea72b0608d541fdaea04f0af4fa1
>>   MD5 (svn-cur.00501.xz) = d4c3d81bfe80a2954eb76a172198dbca
>>   + patch-for-ctm-v04 etc patches applied
>>
>> I see this error:
>>   ctm -v /pub/FreeBSD/development/CTM/svn-cur/svn-cur.00500xEmpty.xz # OK
>>   ctm -v
>> /pub/FreeBSD/development/CTM/svn-cur/svn-cur.00[5-9][0-9][0-9].xz
>>   Working on </pub/FreeBSD/development/CTM/svn-cur/svn-cur.00501.xz>
>>   /pub/FreeBSD/development/CTM/svn-cur/svn-cur.00501.xz Fatal error:
>> Corrupt patch.
>>   Expected " " but didn't find it {0a}.
>>   ctm: exit(65)
>>
>> I downloaded a more recent base & the problem went away
>>   ctm -v /pub/FreeBSD/development/CTM/svn-cur/svn-cur.00800xEmpty.xz
>>   ctm -v /pub/FreeBSD/development/CTM/svn-cur/svn-cur.008[0-9][0-9].xz
>>   cat .ct*    # OK svn-cur 860
>>
>> Was svn-cur.00500xEmpty.xz was generated by older pre patched tools ?
>> (hence no longer on mirror, jusrt on my local archive),
>> or have I discovered a problem ?
>
> The stuff on your local archive must have been created by pre-patch
> tools.  But I think the problem was with svn-cur.00501, not svn-cur.00500.
>
> Because of necessary changes in patch-04, I had to update all the
> svn-cur files.  The old ones won't work.  The error you are getting is
> entirely consistent with what I expect if you were using old files.

Also, I checked your MD5 numbers, and you definitely have deltas created 
with pre-patch tools.

To see this another way, type:
unxz -c svn-cur.00501.xz | head -5 | tail -1

If you get something like:
CTMSV 237140 74601
you have deltas created with pre-patch tools.  Deltas created with 
post-patch tools look like this:
CTMSV base 237140 74601

The appearance of the word "base" is the only difference.  It tells ctm 
which directory to apply the deltas to.  In the case of files from 
svn-ports-cur, the directory is "ports".

If you have pre-patch archives you want to use, you could go through 
them all and add this word in the right place.  But then you will also 
have to change the md5 numbers at the end of the files.  This is not 
entirely trivial, but I can explain it if someone really wants to know.