From owner-freebsd-questions@FreeBSD.ORG Mon Feb 5 17:37:37 2007 Return-Path: X-Original-To: freebsd-questions@freebsd.org Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A6C3C16A4C8 for ; Mon, 5 Feb 2007 17:37:36 +0000 (UTC) (envelope-from njm@njm.f2s.com) Received: from outmail1.freedom2surf.net (outmail1.freedom2surf.net [194.106.33.237]) by mx1.freebsd.org (Postfix) with ESMTP id 493C913C49D for ; Mon, 5 Feb 2007 17:37:34 +0000 (UTC) (envelope-from njm@njm.f2s.com) Received: from ariel.njm.f2s.com (i-195-137-21-170.freedom2surf.net [195.137.21.170]) by outmail1.freedom2surf.net (Postfix) with ESMTP id 1CCB55127B for ; Mon, 5 Feb 2007 17:37:33 +0000 (GMT) Received: from ariel.njm.f2s.com (localhost.njm.f2s.com [127.0.0.1]) by ariel.njm.f2s.com (8.13.8/8.13.6) with ESMTP id l15HbWdP019264 for ; Mon, 5 Feb 2007 17:37:32 GMT (envelope-from njm@ariel.njm.f2s.com) Received: (from njm@localhost) by ariel.njm.f2s.com (8.13.8/8.13.8/Submit) id l15HbWuQ019263 for freebsd-questions@freebsd.org; Mon, 5 Feb 2007 17:37:32 GMT (envelope-from njm) Date: Mon, 5 Feb 2007 17:37:32 +0000 From: "N.J. Mann" To: freebsd-questions@freebsd.org Message-ID: <20070205173732.GC18867@ariel.njm.f2s.com> Mail-Followup-To: freebsd-questions@freebsd.org References: <45C7669E.1080603@debtresolve.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <45C7669E.1080603@debtresolve.com> X-Operating-System: FreeBSD 6.2-STABLE User-Agent: Mutt/1.5.13 (2006-08-11) Subject: Re: CVS (freebsd /src) confusion X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Feb 2007 17:37:37 -0000 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. -- Please do not CC me on replies, I read the list and don't need the dupes.