From owner-ctm-users@FreeBSD.ORG Sun Oct 21 22:57:41 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 28A317E8 for ; Sun, 21 Oct 2012 22:57:41 +0000 (UTC) (envelope-from jhs@berklix.com) Received: from tower.berklix.org (tower.berklix.org [83.236.223.114]) by mx1.freebsd.org (Postfix) with ESMTP id 8C5EC8FC12 for ; Sun, 21 Oct 2012 22:57:39 +0000 (UTC) Received: from mart.js.berklix.net (p5DCBEFAC.dip.t-dialin.net [93.203.239.172]) (authenticated bits=0) by tower.berklix.org (8.14.2/8.14.2) with ESMTP id q9LMvVQF005172; Sun, 21 Oct 2012 22:57:31 GMT (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (fire.js.berklix.net [192.168.91.41]) by mart.js.berklix.net (8.14.3/8.14.3) with ESMTP id q9LMvQdV094252; Mon, 22 Oct 2012 00:57:26 +0200 (CEST) (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (localhost [127.0.0.1]) by fire.js.berklix.net (8.14.4/8.14.4) with ESMTP id q9LMv2HD020822; Mon, 22 Oct 2012 00:57:14 +0200 (CEST) (envelope-from jhs@fire.js.berklix.net) Message-Id: <201210212257.q9LMv2HD020822@fire.js.berklix.net> To: "Klaus T. Aehlig" , Stephen Montgomery-Smith , "ctm-users@freebsd.org" Subject: Re: svn-cur From: "Julian H. Stacey" Organization: http://berklix.com BSD Unix Linux Consultancy, Munich Germany User-agent: EXMH on FreeBSD http://berklix.com/free/ X-URL: http://www.berklix.com In-reply-to: Your message "Sun, 23 Sep 2012 13:35:17 +0200." <20120923113517.GA41319@howard.linta.de> Date: Mon, 22 Oct 2012 00:57:02 +0200 Sender: jhs@berklix.com X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Oct 2012 22:57:41 -0000 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 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 ? Cheers, Julian -- Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com Reply below not above, like a play script. Indent old text with "> ". Send plain text. Not: HTML, multipart/alternative, base64, quoted-printable. From owner-ctm-users@FreeBSD.ORG Sun Oct 21 23:09:36 2012 Return-Path: Delivered-To: ctm-users@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3FFBCA32 for ; Sun, 21 Oct 2012 23:09:36 +0000 (UTC) (envelope-from stephen@missouri.edu) Received: from wilberforce.math.missouri.edu (wilberforce.math.missouri.edu [128.206.184.213]) by mx1.freebsd.org (Postfix) with ESMTP id F0FA88FC12 for ; Sun, 21 Oct 2012 23:09:32 +0000 (UTC) Received: from [127.0.0.1] (wilberforce.math.missouri.edu [128.206.184.213]) by wilberforce.math.missouri.edu (8.14.5/8.14.5) with ESMTP id q9LN9IEe066601; Sun, 21 Oct 2012 18:09:18 -0500 (CDT) (envelope-from stephen@missouri.edu) Message-ID: <5084809E.6050405@missouri.edu> Date: Sun, 21 Oct 2012 18:09:18 -0500 From: Stephen Montgomery-Smith User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: "Julian H. Stacey" Subject: Re: svn-cur References: <201210212257.q9LMv2HD020822@fire.js.berklix.net> In-Reply-To: <201210212257.q9LMv2HD020822@fire.js.berklix.net> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "ctm-users@freebsd.org" , "Klaus T. Aehlig" X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Oct 2012 23:09:36 -0000 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 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. From owner-ctm-users@FreeBSD.ORG Sun Oct 21 23:42:12 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7DF47B77 for ; Sun, 21 Oct 2012 23:42:12 +0000 (UTC) (envelope-from stephen@missouri.edu) Received: from wilberforce.math.missouri.edu (wilberforce.math.missouri.edu [128.206.184.213]) by mx1.freebsd.org (Postfix) with ESMTP id 285EC8FC08 for ; Sun, 21 Oct 2012 23:42:11 +0000 (UTC) Received: from [127.0.0.1] (wilberforce.math.missouri.edu [128.206.184.213]) by wilberforce.math.missouri.edu (8.14.5/8.14.5) with ESMTP id q9LNg3W0068709; Sun, 21 Oct 2012 18:42:04 -0500 (CDT) (envelope-from stephen@missouri.edu) Message-ID: <5084884C.1060709@missouri.edu> Date: Sun, 21 Oct 2012 18:42:04 -0500 From: Stephen Montgomery-Smith User-Agent: Mozilla/5.0 (X11; Linux i686; rv:16.0) Gecko/20121011 Thunderbird/16.0.1 MIME-Version: 1.0 To: "Julian H. Stacey" Subject: Re: svn-cur References: <201210212257.q9LMv2HD020822@fire.js.berklix.net> <5084809E.6050405@missouri.edu> In-Reply-To: <5084809E.6050405@missouri.edu> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: "ctm-users@freebsd.org" , "Klaus T. Aehlig" X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Oct 2012 23:42:12 -0000 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 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. From owner-ctm-users@FreeBSD.ORG Mon Oct 22 08:55:22 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7E354274 for ; Mon, 22 Oct 2012 08:55:22 +0000 (UTC) (envelope-from jhs@berklix.com) Received: from tower.berklix.org (tower.berklix.org [83.236.223.114]) by mx1.freebsd.org (Postfix) with ESMTP id EC66C8FC16 for ; Mon, 22 Oct 2012 08:55:21 +0000 (UTC) Received: from mart.js.berklix.net (pD9FBFA15.dip.t-dialin.net [217.251.250.21]) (authenticated bits=0) by tower.berklix.org (8.14.2/8.14.2) with ESMTP id q9M8tI2s008000; Mon, 22 Oct 2012 08:55:19 GMT (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (fire.js.berklix.net [192.168.91.41]) by mart.js.berklix.net (8.14.3/8.14.3) with ESMTP id q9M8t72t096227; Mon, 22 Oct 2012 10:55:07 +0200 (CEST) (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (localhost [127.0.0.1]) by fire.js.berklix.net (8.14.4/8.14.4) with ESMTP id q9M8se0S023558; Mon, 22 Oct 2012 10:54:46 +0200 (CEST) (envelope-from jhs@fire.js.berklix.net) Message-Id: <201210220854.q9M8se0S023558@fire.js.berklix.net> To: Stephen Montgomery-Smith Subject: Re: svn-cur From: "Julian H. Stacey" Organization: http://berklix.com BSD Unix Linux Consultancy, Munich Germany User-agent: EXMH on FreeBSD http://berklix.com/free/ X-URL: http://www.berklix.com In-reply-to: Your message "Sun, 21 Oct 2012 18:09:18 CDT." <5084809E.6050405@missouri.edu> Date: Mon, 22 Oct 2012 10:54:40 +0200 Sender: jhs@berklix.com Cc: "ctm-users@freebsd.org" , "Klaus T. Aehlig" X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Oct 2012 08:55:22 -0000 > > DRAFT whoops I forgot to remove word draft, when it was no longer a draft. > 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. Yes > 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. OK thanks Stephen, Ive deleted my old ones. Cheers, Julian -- Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com Reply below not above, like a play script. Indent old text with "> ". Send plain text. Not: HTML, multipart/alternative, base64, quoted-printable. From owner-ctm-users@FreeBSD.ORG Mon Oct 22 12:30:10 2012 Return-Path: Delivered-To: ctm-users@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B9F1E7D for ; Mon, 22 Oct 2012 12:30:10 +0000 (UTC) (envelope-from jhs@berklix.com) Received: from tower.berklix.org (tower.berklix.org [83.236.223.114]) by mx1.freebsd.org (Postfix) with ESMTP id B62AE8FC0A for ; Mon, 22 Oct 2012 12:30:09 +0000 (UTC) Received: from mart.js.berklix.net (p5DCBCCFD.dip.t-dialin.net [93.203.204.253]) (authenticated bits=0) by tower.berklix.org (8.14.2/8.14.2) with ESMTP id q9MCU6H3009746; Mon, 22 Oct 2012 12:30:06 GMT (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (fire.js.berklix.net [192.168.91.41]) by mart.js.berklix.net (8.14.3/8.14.3) with ESMTP id q9MCU5pu097376; Mon, 22 Oct 2012 14:30:05 +0200 (CEST) (envelope-from jhs@berklix.com) Received: from fire.js.berklix.net (localhost [127.0.0.1]) by fire.js.berklix.net (8.14.4/8.14.4) with ESMTP id q9MCTfwf040956; Mon, 22 Oct 2012 14:29:47 +0200 (CEST) (envelope-from jhs@fire.js.berklix.net) Message-Id: <201210221229.q9MCTfwf040956@fire.js.berklix.net> To: Stephen Montgomery-Smith Subject: Re: svn-cur From: "Julian H. Stacey" Organization: http://berklix.com BSD Unix Linux Consultancy, Munich Germany User-agent: EXMH on FreeBSD http://berklix.com/free/ X-URL: http://www.berklix.com In-reply-to: Your message "Sun, 21 Oct 2012 18:42:04 CDT." <5084884C.1060709@missouri.edu> Date: Mon, 22 Oct 2012 14:29:41 +0200 Sender: jhs@berklix.com Cc: "ctm-users@freebsd.org" , "Klaus T. Aehlig" X-BeenThere: ctm-users@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: CTM User discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Oct 2012 12:30:10 -0000 > 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 OK, I'd deleted all my svn-cur.007* after your & my last mail, but I found a local backup. Yes I see unxz -c svn-cur.00501.xz | head -5 | tail -1 CTMSV 237140 74601 The change occured between svn-cur.00743.xz & svn-cur.00744.xz > 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". unxz -c svn-ports-cur.00002.xz | head -5 | tail -1 CTMSV ports 303959 105361 > 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. Not for me thanks, I'm happy :-) Cheers, Julian -- Julian Stacey, BSD Unix Linux C Sys Eng Consultant, Munich http://berklix.com Reply below not above, like a play script. Indent old text with "> ". Send plain text. Not: HTML, multipart/alternative, base64, quoted-printable.