Re: CVS (freebsd /src) confusion

2007-02-05 Thread N.J. Mann
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

Re: CVS (freebsd /src) confusion

2007-02-05 Thread Dan Casey
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: