From owner-freebsd-current Mon Feb 11 19: 7:48 2002 Delivered-To: freebsd-current@freebsd.org Received: from newman2.bestweb.net (newman2.bestweb.net [209.94.102.67]) by hub.freebsd.org (Postfix) with ESMTP id 6D17537B495 for ; Mon, 11 Feb 2002 18:17:11 -0800 (PST) Received: from okeeffe.bestweb.net (okeefe.bestweb.net [209.94.100.110]) by newman2.bestweb.net (Postfix) with ESMTP id 9D383231B3; Mon, 11 Feb 2002 21:16:49 -0500 (EST) Received: by okeeffe.bestweb.net (Postfix, from userid 0) id 743C69F278; Mon, 11 Feb 2002 21:11:43 -0500 (EST) Date: Wed, 6 Feb 2002 10:50:12 -0800 To: Lyndon Nerenberg , From: Mark Peek Subject: Re: Mergemaster niggle Cc: Emiel Kollof , current@FreeBSD.ORG Message-Id: <20020212021143.743C69F278@okeeffe.bestweb.net> Sender: owner-freebsd-current@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG At 11:34 AM -0700 2/6/02, Lyndon Nerenberg wrote: > >>>>> "David" == David W Chapman writes: > > David> mergemaster only checks to see if RCSID's are different by > David> default, I forget which option, but there is one to actually > David> diff the two files when doing its inital compare, but the > David> RCSID's would be different so I'm not sure it would help you. > >The real question here is: why is the RCSid changing when the file >isn't? > >While it's not the end of the world, dealing with these noop merges gets >annoying when you're updating large numbers of machines. If there's a >simple fix to the problem (at the source), let's work on it. I've seen this problem in the past. It occurs when you cvsup the repository down to a local copy contained within another CVSROOT. The $FreeBSD$ tags don't get expanded during checkout and will contain the previous revision tag. I believe the file to check is the CVSROOT/options file from the FreeBSD tree. Mark To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message