From owner-freebsd-hackers Mon Nov 6 3:44:54 2000 Delivered-To: freebsd-hackers@freebsd.org Received: from ringworld.oblivion.bg (pool66-tch-1.Sofia.0rbitel.net [212.95.170.66]) by hub.freebsd.org (Postfix) with SMTP id 4266837B479 for ; Mon, 6 Nov 2000 03:44:51 -0800 (PST) Received: (qmail 1807 invoked by uid 1000); 6 Nov 2000 11:44:37 -0000 Date: Mon, 6 Nov 2000 13:44:37 +0200 From: Peter Pentchev To: hackers@freebsd.org Subject: New mergemaster behavior - comparing CVS $Id too Message-ID: <20001106134437.A556@ringworld.oblivion.bg> Mail-Followup-To: hackers@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.2.5i Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Is there a way to make mergemaster revert to its old behavior - only comparing $FreeBSD tags on files which have those? I keep some of my /etc files in a CVS repository of my own, and in the last mergemaster runs it detects that the file in /etc has an $Id, while the file in /var/tmp/temproot does not, and reports a difference. (Well, yes, I guess I could remove the $Id tags from my own files, but.. is there another way? :) G'luck, Peter PS. And yes, I know RELENG_4 is frozen now, but.. still.. :) -- I am not the subject of this sentence. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message