From owner-freebsd-stable@FreeBSD.ORG Fri Dec 3 04:27:05 2010 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC3AC1065670 for ; Fri, 3 Dec 2010 04:27:05 +0000 (UTC) (envelope-from jhellenthal@gmail.com) Received: from mail-yx0-f182.google.com (mail-yx0-f182.google.com [209.85.213.182]) by mx1.freebsd.org (Postfix) with ESMTP id 7C8CB8FC0A for ; Fri, 3 Dec 2010 04:27:05 +0000 (UTC) Received: by yxh35 with SMTP id 35so4813981yxh.13 for ; Thu, 02 Dec 2010 20:27:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :organization:user-agent:mime-version:to:cc:subject:references :in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; bh=Od40GQhvNYRJ0tcZb3LlQqy0En7Q9cTWqx+ezrWbFj0=; b=KQGDGvt5qQJiDGCYQusJXzEXv7MoxwoBajdH+Vm+eZQGA3ZeLvomxqB0tuEWEgZGvv 2zrSnlkI2gFUHssK/b8mYBiOmC0TJ6i9T/UmVQ5BuWYZResbYtKweGM6T9tlF6oraBHl JXtjuGRrl8lfvFPFTvvZnU0wrlWYo31dfrtIg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:organization:user-agent:mime-version:to :cc:subject:references:in-reply-to:x-enigmail-version:content-type :content-transfer-encoding; b=B4OAH/7UZxaH4wgoSIq9Obn+5oJUARHsgj8jofwPGLGCB27UEYI2dbn2o0P4UYYYBi 3bsJ7xws+2oh5LZqexPdhxVmZi/56ilQBVG9OfdEAiIAw+y1WwMl4cUs3bYVZlAAZyLP pmLxwL3wytHGj+RHuU0oqv7JwM+XbW8VofaXM= Received: by 10.150.186.11 with SMTP id j11mr3058989ybf.82.1291350424226; Thu, 02 Dec 2010 20:27:04 -0800 (PST) Received: from centel.dataix.local (adsl-99-19-40-65.dsl.klmzmi.sbcglobal.net [99.19.40.65]) by mx.google.com with ESMTPS id q31sm1004451yba.18.2010.12.02.20.27.01 (version=SSLv3 cipher=RC4-MD5); Thu, 02 Dec 2010 20:27:02 -0800 (PST) Sender: "J. Hellenthal" Message-ID: <4CF87194.8090307@DataIX.net> Date: Thu, 02 Dec 2010 23:27:00 -0500 From: jhell Organization: http://www.DataIX.net User-Agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.9.2.12) Gecko/20101028 Lightning/1.0b1 Thunderbird MIME-Version: 1.0 To: Geoff Roberts References: <20101203142558.84045dewtg0zfpss@aprosrv2.apro.com.au> In-Reply-To: <20101203142558.84045dewtg0zfpss@aprosrv2.apro.com.au> X-Enigmail-Version: 1.1.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable@freebsd.org Subject: Re: Some /etc files seem out of date in RELENG_8 compared to RELENG_8_1 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 03 Dec 2010 04:27:06 -0000 -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On 12/02/2010 22:25, Geoff Roberts wrote: > > Hi, > > I was just doing and update to 8-PRERELEASE from 8.1 by using the > RELENG_8 tag in cvsup. > > When I used mergemaster to update /etc, there were a number of files > being merged into /etc that are older revisions than those I had in 8.1. > > You can check this for example by comparing the revision numbers at > the following URLS. > > Compare say syslog.conf (there are a whole list of other files that > are out of date). > > In 8.1 it has a revision of 1.30.2.1.4.1 - 5 months old > > In 8.X it has a revision of 1.30.2.1 - 16 months old > This is how CVS is intended to work. Though my explanation would be to straight to the point, this URL seems to explain it in more detail. These files are not out of date. http://cvsman.com/cvs-1.12.12/cvs_60.php#SEC60 > http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/?only_with_tag=RELENG_8_1 > > > http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/?only_with_tag=RELENG_8 > > Shouldn't RELENG_8 have all the changes that went into RELENG_8_1 as > FreeBSD moves to 8.2? > Regards, - -- jhell,v -----BEGIN PGP SIGNATURE----- iQEcBAEBAgAGBQJM+HGTAAoJEJBXh4mJ2FR+hxIH/1N0y6/150lH50rTHowRYaHL yJqafch2EcO3HsA0nDtnJx+Vb6qsVTiZgzBXK/mnWI6nDmP8uPz8Y49LFjd0PCPH wrV4TuENeKXl2xxvb8+mGD++cf5VzZim2qgaAq+JWVrphA7UtaqMFBixUwljwFfT 31ivTu2eRpUO2lZyY6LrRYCp7y0sHIMiAuycYghqvvwvdvyizPCR0VrEH/vbLL6O zxxZq2mCUoPLGkVDXdcLp5TYoN2ujRsQCGNvKW93ebz+ipAcwz5bdPicVPmjTtnY vM+Q+jnza+141RkAxTvkIXwN+/THyJJzIx+aWZb5pXPdH7npGsjBmcXLVUbJLlg= =obeJ -----END PGP SIGNATURE-----