From owner-freebsd-questions@FreeBSD.ORG Mon Feb 5 17:17:42 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 E66BC16A401 for ; Mon, 5 Feb 2007 17:17:41 +0000 (UTC) (envelope-from dcasey@debtresolve.com) Received: from debtresolve.com (ip175-18.wp-ny-us.debtresolve.com [66.236.175.18]) by mx1.freebsd.org (Postfix) with ESMTP id AD4D613C4A5 for ; Mon, 5 Feb 2007 17:17:41 +0000 (UTC) (envelope-from dcasey@debtresolve.com) Received: from dummy.name; Mon, 05 Feb 2007 12:17:43 -0500 Message-ID: <45C7669E.1080603@debtresolve.com> Date: Mon, 05 Feb 2007 12:17:18 -0500 From: Dan Casey User-Agent: Thunderbird 1.5.0.9 (Windows/20061207) MIME-Version: 1.0 To: freebsd-questions@freebsd.org X-Enigmail-Version: 0.94.1.1 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Subject: 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:17:42 -0000 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 Did freebsd tag older versions a some files, or am I going nuts?