Re: Old /etc files back, or cvs error?
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 ended up with. I should have been more careful in watching what was going on. It wasn't adding files, just updating files that only differed in version strings. A test system showed that as of now, there's somewhere around 325 files in /etc like that. That's not counting files which will probably be different like /etc/master.passwd and /etc/group, or the sendmail files which are customized with built by messages. (The differing file version strings are due to the svn to cvs export, as explained by Erik Trulsson.) If that doesn't work, please script your mergemaster session and send us the output. I did save both a full session and a cleaned list of files from a test system built with 7.1-RELEASE and updated to 7-STABLE: http://www.wonkity.com/~wblock/freebsd-7-stable/ Only after manually creating that list of files did it occur to me that there ought to be a way to skip files that differ only in version strings, and that mergemaster should have that. And *then* I finally checked the man page for mergemaster, where the mysterious -U option is described. mergemaster -U works fine. Had I only been lazy enough to look it up beforehand... The mergemaster man page doesn't tell how mergemaster detects files that have not been user modified, so I'm not sure how safe -U really is. If it's safe for everyday users, then the second mergemaster step in the standard updating procedure in the Handbook should include the -U. The svn/cvs/version string thing sure looks like a bug, but no doubt fixing it is easier said than done. -Warren Block * Rapid City, South Dakota USA ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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 ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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 in RELENG_7? Are there something wrong with the newer files? For RELENG_7 users it is inconvenient to have to go through all these files every time a 7.1-release install gets updated to RELENG_7. -- Regards, Torfinn Ingolfsen ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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? -Warren Block * Rapid City, South Dakota USA ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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 (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? I think the 2008/11/25 date is from when RELENG_7_1 was branched --- the branch took place after the file was created, so it looks newer, even though the content is the same. -Ben Kaduk ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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 ertr1...@student.uu.se ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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. 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 ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Re: Old /etc files back, or cvs error?
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 not in the master svn and cvs repositories. Doug -- This .signature sanitized for your protection ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
Old /etc files back, or cvs error?
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 ___ freebsd-stable@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-stable To unsubscribe, send any mail to freebsd-stable-unsubscr...@freebsd.org
