Lately I've installed a couple of test systems from 7.1-RELEASE CDs, then csupped to RELENG_7 from cvsup9: *default host=cvsup9.FreeBSD.org *default base=/var/db *default prefix=/usr *default release=cvs tag=RELENG_7 *default delete use-rel-suffix 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? The latest entries for files in /etc/isdn are 9 months old, and were removals. This looks like an error, but maybe I'm missing something. And other cvsup mirrors seem to agree with cvsup9. -Warren Block * Rapid City, South Dakota USA
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: > > *default host=cvsup9.FreeBSD.org > *default base=/var/db > *default prefix=/usr > *default release=cvs tag=RELENG_7 > *default delete use-rel-suffix > > 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? > > The latest entries for files in /etc/isdn are 9 months old, and were > removals. > > This looks like an error, but maybe I'm missing something. And other > cvsup mirrors seem to agree with cvsup9.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 Go to http://www.freebsd.org/cgi/cvsweb.cgi/src/etc/bluetooth/hcsecd.conf and you can see the versions and the tags. Kent -- kent Stewart Richland, WA http://users.owt.com/kstewart/index.html
Warren Block wrote:> Lately I've installed a couple of test systems from 7.1-RELEASE CDs, > then csupped to RELENG_7 from cvsup9: > > *default host=cvsup9.FreeBSD.org > *default base=/var/db > *default prefix=/usr > *default release=cvs tag=RELENG_7 > *default delete use-rel-suffixThat looks right.> 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/*.That is definitely not the outcome you should have ended up with. I just checked both the official svn repo and the official cvs repo and the files they are passing out for the two relevant branches are correct, and the real differences (not $Id tags) between the files in the two branches are what I expected to see. Therefore, the problem is somewhere downstream.> This looks like an error, but maybe I'm missing something. And other > cvsup mirrors seem to agree with cvsup9.My suggestion to you would be to move all source trees that you may have currently somewhere else, move aside /var/db/sup, then start over from scratch and see if what you get is what you expect. If that doesn't work, please script your mergemaster session and send us the output. hope this helps, Doug -- This .signature sanitized for your protection