Re: Old /etc files back, or cvs error?

2009-02-27 Thread Warren Block
On Tue, 24 Feb 2009, Doug Barton wrote: Warren Block wrote: 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

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Kent Stewart
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

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Torfinn Ingolfsen
On Tue, 24 Feb 2009 00:58:31 -0800 Kent Stewart kstew...@owt.com wrote: You are looking at the version for the 7.1 release version. The RELENG_7 version is The real question is: why are the files in 7.1-release newer than those in RELENG_7? In other words: why haven't those files been updated

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Warren Block
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.

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Ben Kaduk
On Tue, Feb 24, 2009 at 5:53 PM, Warren Block wbl...@wonkity.com wrote: 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

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Erik Trulsson
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

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Doug Barton
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 That looks right.

Re: Old /etc files back, or cvs error?

2009-02-24 Thread Doug Barton
Torfinn Ingolfsen wrote: On Tue, 24 Feb 2009 00:58:31 -0800 Kent Stewart kstew...@owt.com wrote: You are looking at the version for the 7.1 release version. The RELENG_7 version is The real question is: why are the files in 7.1-release newer than those in RELENG_7? They aren't. At least

Old /etc files back, or cvs error?

2009-02-23 Thread Warren Block
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