[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: CVS (freebsd /src) confusion
- To: freebsd-questions_(_at_)_freebsd_(_dot_)_org
- Subject: Re: CVS (freebsd /src) confusion
- From: Dan Casey <dcasey_(_at_)_debtresolve_(_dot_)_com>
- Date: Mon, 05 Feb 2007 13:49:33 -0500
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 220.127.116.11 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 18.104.22.168 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.
>> version in 6.1 - $FreeBSD: src/etc/defaults/devfs.rules,v 22.214.171.124
>> 2006/04/26 18:39:17
>> version in 6.2 - $FreeBSD: src/etc/defaults/devfs.rules,v 126.96.36.199
>> 2006/04/26 18:38:43
>> version in 6.1 - $FreeBSD: src/etc/defaults/periodic.conf,v 188.8.131.52
>> 2006/03/08 23:01:18
>> version in 6.2 - $FreeBSD: src/etc/defaults/periodic.conf,v 184.108.40.206
>> 2006/09/28 01:59:29
> I just checked in the CVS repository using the web interface at
> 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. :-)
freebsd-questions_(_at_)_freebsd_(_dot_)_org mailing list
To unsubscribe, send any mail to "freebsd-questions-unsubscribe_(_at_)_freebsd_(_dot_)_org"
Visit your host, monkey.org