From owner-freebsd-current Wed Feb 6 10:50:24 2002 Delivered-To: freebsd-current@freebsd.org Received: from relay.pair.com (relay1.pair.com [209.68.1.20]) by hub.freebsd.org (Postfix) with SMTP id 286A437B417 for ; Wed, 6 Feb 2002 10:50:22 -0800 (PST) Received: (qmail 48806 invoked from network); 6 Feb 2002 18:50:20 -0000 Received: from nat.ironport.com (HELO ?10.1.1.121?) (63.251.108.100) by relay1.pair.com with SMTP; 6 Feb 2002 18:50:20 -0000 X-pair-Authenticated: 63.251.108.100 Mime-Version: 1.0 X-Sender: markfree@mail.peek.org Message-Id: In-Reply-To: <200202061834.g16IYbx70840@orthanc.ab.ca> References: <200202061834.g16IYbx70840@orthanc.ab.ca> Date: Wed, 6 Feb 2002 10:50:12 -0800 To: Lyndon Nerenberg , "David W. Chapman Jr." From: Mark Peek Subject: Re: Mergemaster niggle Cc: Emiel Kollof , current@FreeBSD.ORG Content-Type: text/plain; charset="us-ascii" ; format="flowed" 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