From owner-freebsd-doc@FreeBSD.ORG Fri Dec 12 22:37:20 2003 Return-Path: Delivered-To: freebsd-doc@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 8419116A4CE; Fri, 12 Dec 2003 22:37:20 -0800 (PST) Received: from eth0.b.smtp.sonic.net (eth0.b.smtp.sonic.net [64.142.19.4]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6F9F743D35; Fri, 12 Dec 2003 22:37:17 -0800 (PST) (envelope-from bmah@intruder.kitchenlab.org) Received: from intruder.kitchenlab.org (adsl-64-142-31-106.sonic.net [64.142.31.106])hBD6bFdM019979 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Fri, 12 Dec 2003 22:37:15 -0800 Received: from intruder.kitchenlab.org (bmah@localhost [127.0.0.1]) hBD6bEO0034446; Fri, 12 Dec 2003 22:37:15 -0800 (PST) (envelope-from bmah@intruder.kitchenlab.org) Message-Id: <200312130637.hBD6bEO0034446@intruder.kitchenlab.org> X-Mailer: exmh version 2.6.3 04/04/2003 with nmh-1.0.4 To: "Simon L. Nielsen" In-Reply-To: <20031213005250.GG671@arthur.nitro.dk> References: <3FDA594A.8030307@alexdupre.com> <20031213002532.GF671@arthur.nitro.dk> <3FDA6070.8040001@alexdupre.com> <20031213005250.GG671@arthur.nitro.dk> Comments: In-reply-to "Simon L. Nielsen" message dated "Sat, 13 Dec 2003 01:52:52 +0100." From: "Bruce A. Mah" X-Face: g~c`.{#4q0"(V*b#g[i~rXgm*w;:nMfz%_RZLma)UgGN&=j`5vXoU^@n5v4:OO)c["!w)nD/!!~e4Sj7LiT'6*wZ83454H""lb{CC%T37O!!'S$S&D}sem7I[A 2V%N&+ X-Image-Url: http://www.employees.org/~bmah/Images/bmah-cisco-small.gif X-Url: http://www.employees.org/~bmah/ Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_-1437624428P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Fri, 12 Dec 2003 22:37:14 -0800 Sender: bmah@intruder.kitchenlab.org cc: freebsd-doc@freebsd.org cc: Alex Dupre Subject: Re: docs/60167: [Maintainer Update] Italian Documentation X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: bmah@freebsd.org List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Dec 2003 06:37:20 -0000 --==_Exmh_-1437624428P Content-Type: text/plain; charset=us-ascii If memory serves me right, "Simon L. Nielsen" wrote: > On 2003.12.13 01:42:24 +0100, Alex Dupre wrote: > > Simon L. Nielsen wrote: > >=20 > > >I just tried and I get the same error as Marc. In your log you only > > >delete doc/it_IT.ISO8859-15/. Are you sure you don't have something in > > >doc/share that's not in the patch ? > >=20 > > I deleted the share folder and repeated the build cycle....same result,= > =20 > > it works flawlessy. > > Problem found... patch(1) has to be run with the '-p0' parameter, > otherwise it will not do the right thing (it seems it patches files in > the wrong directories). With '-p0' it builds for me. Confirmed here. The next problem...I thought I'd try to commit this before tagging doc/ for 5.2-RELEASE (I know you asked doceng@ about it, but I figured, based on the timestamps in your email, you probably went to sleep or something). CVS said: ----- chapter.sgml - GRRR!! You spammed your copy of the file which was based upon version 1.3, with a different version based upon 1.2. Please move your 'doc/it_IT.ISO8859-15/books/handbook/vinum/chapter.sgml' out of the way, perform an update to get the current version, and then CAREFULLY merge your changes into that file. commit_prep.pl failed! cvs server: Pre-commit check failed cvs [server aborted]: correct above errors first! cvs commit: saving log message in /tmp/cvslp16UY ----- Alex, can you lend some insight here? CVS is correct, in that the $FreeBSD$ in the file indicates version 1.2, but 1.3 is current. I believe I can blow away the expansion of $FreeBSD$ and do the commit, and CVS will re-expand this keyword correctly, but I want to make sure there wasn't anything out-of-the-ordinary with this file first. I'm going to tag doc/ anyways, and if this issue gets resolved reasonably soon (like say, this weekend), and I can still build it_IT after the patch, I can slide the tags forward on the affected files to make sure they get into the release set. Bruce. --==_Exmh_-1437624428P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.3 (FreeBSD) Comment: Exmh version 2.5+ 20020506 iD8DBQE/2rOa2MoxcVugUsMRAkOXAJ0V3MO2DbPfzNx74dJkdVTKw+f+cACeLhgj m2ISR3byTwbrtOgt9oPf3XI= =Np4h -----END PGP SIGNATURE----- --==_Exmh_-1437624428P--