From owner-freebsd-current  Wed Nov  8 18:27: 1 2000
Delivered-To: freebsd-current@freebsd.org
Received: from InterJet.dellroad.org (adsl-63-194-81-26.dsl.snfc21.pacbell.net [63.194.81.26])
	by hub.freebsd.org (Postfix) with ESMTP id 6366B37B479
	for <freebsd-current@freebsd.org>; Wed,  8 Nov 2000 18:26:59 -0800 (PST)
Received: from curve.dellroad.org (curve.dellroad.org [10.1.1.30])
	by InterJet.dellroad.org (8.9.1a/8.9.1) with ESMTP id SAA65229
	for <freebsd-current@freebsd.org>; Wed, 8 Nov 2000 18:26:58 -0800 (PST)
Received: (from archie@localhost)
	by curve.dellroad.org (8.11.0/8.11.0) id eA92Qw800408
	for freebsd-current@freebsd.org; Wed, 8 Nov 2000 18:26:58 -0800 (PST)
	(envelope-from archie)
From: Archie Cobbs <archie@dellroad.org>
Message-Id: <200011090226.eA92Qw800408@curve.dellroad.org>
Subject: mergemaster and $FreeBSD$
To: freebsd-current@freebsd.org
Date: Wed, 8 Nov 2000 18:26:58 -0800 (PST)
X-Mailer: ELM [version 2.4ME+ PL82 (25)]
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

My machines get their source code from a local CVS mirror of the
FreeBSD source tree, which is at /home/cvs/freebsd/src.. we have
our own CVSROOT stuff of course.

So when stuff is checked out of the freebsd/* repostitories, the
$FreeBSD$ tags don't get substituted correctly.

This causes mergemaster to list a zillion files as having differences
in only this string every upgrade.. even worse, mergemaster in some
cases seems to be comparing only the $FreeBSD$ strings and incorrectly
concluding that certain files don't need upgrading, when in fact they do.

So.. what stuff in /home/cvs/CVSROOT can I change so that sources
in freebsd/* get $FreeBSD$ substitution, but other sources get the
normal $Id$ substitution? Surely someone has solved this already.. ?

Thanks,
-Archie

__________________________________________________________________________
Archie Cobbs     *     Packet Design     *     http://www.packetdesign.com


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message