Doug Barton wrote:
On Thu, 12 Mar 2009, Andrei Kolu wrote:
Hello!
As long time FreeBSD user I am concerned about RELEASE and STABLE
configuration files inconsistency.
This topic was covered recently, you might want to check the archives.
-# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37.18.1 2008/11/25
02:59:29 kensmith Exp $
+# $FreeBSD: src/etc/rc.d/network_ipv6,v 1.37 2004/10/07 13:55:26 mtm
Exp $
What you're seeing is an artifact of the way that CVS deals with
cutting a release. Even though the content of the files is the same,
the CVS Id is updated in the release branch so that you can track
revisions to that file that occur within that branch (e.g.,
RELENG_6_4), as opposed to the changes that occur in the parent branch
(RELENG_6). This is a feature.
You can easily deal with this in mergemaster by using the -U option
(please see the man page). If you're dealing with the problem of a
clean installation from a -RELEASE CD (or similar) upgrading to the
stable branch for the first time, -U won't help you unfortunately. But
it will help you on each successive update. For that first update what
I usually do is 'rm -r /etc/rc.d/* /etc/periodic/* /etc/defaults/*'
and then use mergemaster's -i option. That will cover the majority of
the problem.
I am upgrading from 7.1-RELEASE (cd) to 7.1-STABLE, anyway it does not
make any sense to "upgrade" to older version of config files. I hope
this issue will be resolved.
FreeBSD 7.1-STABLE #0: Wed Mar 11 22:29:33 EET 2009 amd64
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-stable
To unsubscribe, send any mail to "[email protected]"
