Were it gets even more confusing is files like freebsd.submit.cf where
there are multiple version numbers.
The version in my temproot is
$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.1.12.2 2006/08/23
$Id: proto.m4,v 8.719 2006/03/30 20:50:13
And on my system I have:
$FreeBSD: src/etc/sendmail/freebsd.submit.mc,v 1.1.16.1 2006/04/13
$Id: proto.m4,v 8.718 2005/08/24 18:07:23
Now each file is newer and older then the other :)
Basically I just want to make sure i'm merging in the right direction.
I don't want to accidentally break something.
N.J. Mann wrote:
On Monday, 5 February, 2007 at 12:17:18 -0500, Dan Casey wrote:
Using cvsup I am upgrading my boxes from RELENG_6_1, to RELENG_6_2.
I've been noticing something strange, and I'm wondering if I'm thinking
too much into it.
I've modified mergemaster so that instead of using diff, it would just
append to a text the files that need to be diffed. This way i can do it
with vimdiff instead.
I would think that the RELENG_6_2 would have more recent files then
6_1. Here are a few examples.
I'm looking at cvsweb, which seems to confirm that that the versions of
these files are correct.
/etc/defaults/devfs.rules
version in 6.1 - $FreeBSD: src/etc/defaults/devfs.rules,v 1.3.12.1
2006/04/26 18:39:17
version in 6.2 - $FreeBSD: src/etc/defaults/devfs.rules,v 1.3.8.1
2006/04/26 18:38:43
/etc/defaults/periodic.conf
version in 6.1 - $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.1
2006/03/08 23:01:18
version in 6.2 - $FreeBSD: src/etc/defaults/periodic.conf,v 1.33.2.2
2006/09/28 01:59:29
I just checked in the CVS repository using the web interface at
http://www.freebsd.org/cgi/cvsweb.cgi
and it appears you have the correct versions of the files. As to why
the devfs.rules is (an apparently) earlier version, I don't know. You
could try browsing the CVS repository if you really want to know. :-)
Cheers,
Nick.
___
freebsd-questions@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-questions
To unsubscribe, send any mail to [EMAIL PROTECTED]