From owner-freebsd-current Fri Nov 10 10:20:29 2000 Delivered-To: freebsd-current@freebsd.org Received: from dt051n37.san.rr.com (dt051n37.san.rr.com [204.210.32.55]) by hub.freebsd.org (Postfix) with ESMTP id 6438D37B4C5 for ; Fri, 10 Nov 2000 10:20:26 -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 KAA92187; Fri, 10 Nov 2000 10:19:50 -0800 (PST) (envelope-from DougB@FreeBSD.org) Message-ID: <3A0C3C45.1D55BAC9@FreeBSD.org> Date: Fri, 10 Nov 2000 10:19:49 -0800 From: Doug Barton 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: Archie Cobbs Cc: freebsd-current@FreeBSD.org Subject: Re: mergemaster and $FreeBSD$ References: <200011090226.eA92Qw800408@curve.dellroad.org> Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.ORG Archie Cobbs wrote: > > 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. Just so I understand, you don't have a mirror of the freebsd CVS repo itself, you have your own repo with the freebsd files in it? If it's the former, you definitely shouldn't be having this problem, as I use a local mirror of the freebsd repo to generate all my source, both at home and work. If it's the latter, you could try adding the magic that was suggested previously to get your local repo to expand the $FreeBSD$ tags. > 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. mm uses two methods to determine whether a file needs updating. It first checks the CVS Id tag to see if it's the same. If it's not, then it does a straight diff of the two files. Up till 11/1 it did 'grep "[$]FreeBSD:' to find the string for FreeBSD, now it does 'ident filename' instead. You might try that new version and see if it works better for you. You could also try using 'mergemaster -s', or put STRICT=yes in your .mergemasterrc file. This causes mm to skip the ident test and always do a strict comparison of each file. Beyond that, it may turn out that mm just isn't going to work for you. There are only so many ways I can do the comparison that will work for the majority of users without needing excessive gymnastics. Good luck, Doug -- Life is an essay test. Long form. Spelling counts. Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message