Date: Wed, 25 Feb 2009 00:29:45 +0100 From: Erik Trulsson <ertr1013@student.uu.se> To: Warren Block <wblock@wonkity.com> Cc: freebsd-stable@freebsd.org, Kent Stewart <kstewart@owt.com> Subject: Re: Old /etc files back, or cvs error? Message-ID: <20090224232945.GA22871@owl.midgard.homeip.net> In-Reply-To: <alpine.BSF.2.00.0902241538180.44980@wonkity.com> References: <alpine.BSF.2.00.0902232254130.40842@wonkity.com> <200902240058.31212.kstewart@owt.com> <alpine.BSF.2.00.0902241538180.44980@wonkity.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Feb 24, 2009 at 03:53:18PM -0700, Warren Block wrote: > On Tue, 24 Feb 2009, Kent Stewart wrote: > > On Monday 23 February 2009 10:11:45 pm Warren Block wrote: > >> Lately I've installed a couple of test systems from 7.1-RELEASE CDs, > >> then csupped to RELENG_7 from cvsup9: > >> > >> mergemaster adds a *lot* of old files in /etc that were not there in > >> 7.1-RELEASE. (Remember the rc.d rework? Like that.) For example, a > >> bunch of bluetooth files and /etc/isdn/*. > >> > >> The version numbers and dates in mergemaster look wrong. For example, > >> /etc/bluetooth/hcsecd.conf: > >> > >> # $Id: hcsecd.conf,v 1.1 2003/05/26 22:50:47 max Exp $ > >> # $FreeBSD: src/etc/bluetooth/hcsecd.conf,v 1.3 2006/05/18 17:53:49 emax > >> Exp $ > >> > >> Shouldn't that be 1.3.6.1 from Tue Nov 25 02:59:29 2008? > > > > You are looking at the version for the 7.1 release version. The RELENG_7 > > version is > > > > Revision 1.3: download - view: text, markup, annotated - select for diffs > > Thu May 18 17:53:49 2006 UTC (2 years, 9 months ago) by emax > > Branches: MAIN > > CVS tags: RELENG_7_BP, RELENG_7_1_BP, RELENG_7_0_BP, RELENG_7_0_0_RELEASE, > > RELENG_7_0, RELENG_7, HEAD > > Branch point for: RELENG_7_1 > > Diff to: previous 1.2: preferred, colored > > Changes since revision 1.2: +1 -1 lines > > I guess I just don't understand. Why did that file and so many others > in /etc go backwards: > > 7.1-RELEASE had 1.3.6.1 2008/11/25 > > Three months later: > > RELENG_7 (7.1-STABLE) has 1.3 2006/05/18 > > Were those later versions (maybe just version strings) included in > 7.1-RELEASE by mistake? Were they tagged by mistake and this latest > change is just fixing that error? The tagging itself causes the version number of the file to be updated. This makes the file in -RELEASE *look* newer then the ones in -STABLE even if the contents of the files haven't actually changed. So there is no mistake, just an annoying side-effect of how the svn->cvs export works with regards to tagging. -- <Insert your favourite quote here.> Erik Trulsson ertr1013@student.uu.se
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20090224232945.GA22871>