Date: Mon, 6 Nov 2000 13:44:37 +0200 From: Peter Pentchev <roam@orbitel.bg> To: hackers@freebsd.org Subject: New mergemaster behavior - comparing CVS $Id too Message-ID: <20001106134437.A556@ringworld.oblivion.bg>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20001106134437.A556>