From owner-freebsd-questions@FreeBSD.ORG Sun Feb 24 14:04:54 2008 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8872C16A400 for ; Sun, 24 Feb 2008 14:04:54 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from ch-smtp01.sth.basefarm.net (ch-smtp01.sth.basefarm.net [80.76.149.212]) by mx1.freebsd.org (Postfix) with ESMTP id 07D6313C4F6 for ; Sun, 24 Feb 2008 14:04:53 +0000 (UTC) (envelope-from erikt@midgard.homeip.net) Received: from c83-253-25-183.bredband.comhem.se ([83.253.25.183]:54195 helo=falcon.midgard.homeip.net) by ch-smtp01.sth.basefarm.net with esmtp (Exim 4.68) (envelope-from ) id 1JTHTI-0003N9-6Q for freebsd-questions@freebsd.org; Sun, 24 Feb 2008 15:04:53 +0100 Received: (qmail 72543 invoked from network); 24 Feb 2008 15:04:49 +0100 Received: from owl.midgard.homeip.net (10.1.5.7) by falcon.midgard.homeip.net with ESMTP; 24 Feb 2008 15:04:49 +0100 Received: (qmail 68787 invoked by uid 1001); 24 Feb 2008 15:04:49 +0100 Date: Sun, 24 Feb 2008 15:04:49 +0100 From: Erik Trulsson To: Chris Message-ID: <20080224140449.GA68747@owl.midgard.homeip.net> Mail-Followup-To: Chris , FreeBSD Questions References: <3aaaa3a0802240516r4e3e99abp14cd5c02133c9815@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <3aaaa3a0802240516r4e3e99abp14cd5c02133c9815@mail.gmail.com> User-Agent: Mutt/1.5.17 (2007-11-01) X-Originating-IP: 83.253.25.183 X-Scan-Result: No virus found in message 1JTHTI-0003N9-6Q. X-Scan-Signature: ch-smtp01.sth.basefarm.net 1JTHTI-0003N9-6Q 1456b1dbd9bc4525e8d4e957f0b7716d Cc: FreeBSD Questions Subject: Re: RELENG_7 versus RELENG_7_0, latter is newer? X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Feb 2008 14:04:54 -0000 On Sun, Feb 24, 2008 at 01:16:04PM +0000, Chris wrote: > I expected RELENG_7 to have newer files than RELENG_7_0 as the latter > tracks a release whilst the former tracks CURRENT/STABLE whichever it > currently is. > > However I noticed 2 things. > > 1 - RELENG_7_0 in newvers.sh shows 7.0-RELEASE whilst RELENG_7 shows PRERELEASE. Yes, it is supposed to be that way. RELENG_7 will continue to show -PRERELEASE until after 7.0-RELEASE is out, at which point it will switch to show -STABLE. > 2 - RELENG_7_0 has higher version numbers than RELENG_7 on the src > files and config files for mergemaster. Considering that almost all changes to RELENG_7_0 are first applied to RELENG_7 before being applied to the (newer) RELENG_7_0 branch this is not surprising. Note also that the revision numbers that CVS assigns to each revision of a file depends heavily on which branch the file comes from, and which revision that branch is derived from. Higher number does not necessarily imply newer file. > > Given this information is it the case RELENG_7 has simply stopped been > updated? possibly even a fault on the cvsup servers I have been using. Unlikely. > > /usr/src/UPDATING both have the 7.0-RELEASE line however. > > example below > > RELENG_7_0 > FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.274.4.1 > > RELENG_7 > FreeBSD: src/usr.sbin/sysinstall/sysinstall.h,v 1.274.2.1 Looks just fine to me. -- Erik Trulsson ertr1013@student.uu.se