From owner-freebsd-hackers  Tue Nov  7  0:15:22 2000
Delivered-To: freebsd-hackers@freebsd.org
Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55])
	by hub.freebsd.org (Postfix) with ESMTP id 749B137B479
	for <hackers@FreeBSD.org>; Tue,  7 Nov 2000 00:15:19 -0800 (PST)
Received: from FreeBSD.org (Studded@master [10.0.0.2])
	by dt051n37.san.rr.com (8.9.3/8.9.3) with ESMTP id AAA03020;
	Tue, 7 Nov 2000 00:15:14 -0800 (PST)
	(envelope-from DougB@FreeBSD.org)
Message-ID: <3A07BA12.A3CD8C88@FreeBSD.org>
Date: Tue, 07 Nov 2000 00:15:14 -0800
From: Doug Barton <DougB@FreeBSD.org>
Organization: Triborough Bridge & Tunnel Authority
X-Mailer: Mozilla 4.76 [en] (X11; U; Linux 2.2.12 i386)
X-Accept-Language: en
MIME-Version: 1.0
To: Peter Pentchev <roam@orbitel.bg>
Cc: hackers@FreeBSD.org
Subject: Re: New mergemaster behavior - comparing CVS $Id too
References: <20001106134437.A556@ringworld.oblivion.bg>
Content-Type: text/plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Sender: owner-freebsd-hackers@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

Peter Pentchev wrote:
> 
> Is there a way to make mergemaster revert to its old behavior - only
> comparing $FreeBSD tags on files which have those? 

	Of course there is a way, the question is how likely it is to happen.
:)  You've stated the solution, just take the local tags out for now.
They don't tell you anything that 'cvs status' doesn't already tell you. 

	I struggled with this change, because I myself use a CVS repo to store
local mods to config files. One of the goals of the current round of
mergemaster mods is to make the thing more palatable across *BSD
platforms. There were already too many if it's one $Id tag or another
definitions in the old code, and it was going to get bigger. If there is
a great hue and cry over this problem, I'll look at changing it back,
but frankly my inclination is that using 'ident' is going to be the best
solution long term.

Doug
-- 
    Life is an essay test. Long form. Spelling counts.

	Do YOU Yahoo!?


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