From owner-freebsd-current Wed Feb 6 10:35: 1 2002 Delivered-To: freebsd-current@freebsd.org Received: from orthanc.ab.ca (orthanc.ab.ca [216.123.203.186]) by hub.freebsd.org (Postfix) with ESMTP id 2093C37B400 for ; Wed, 6 Feb 2002 10:34:58 -0800 (PST) Received: from orthanc.ab.ca (localhost.orthanc.ab.ca [127.0.0.1]) by orthanc.ab.ca (8.11.6/8.11.6) with ESMTP id g16IYbx70840; Wed, 6 Feb 2002 11:34:37 -0700 (MST) (envelope-from lyndon@orthanc.ab.ca) Message-Id: <200202061834.g16IYbx70840@orthanc.ab.ca> From: Lyndon Nerenberg Organization: The Frobozz Magic Homing Pigeon Company To: "David W. Chapman Jr." Cc: Emiel Kollof , current@FreeBSD.ORG Subject: Re: Mergemaster niggle In-reply-to: Your message of "Wed, 06 Feb 2002 12:26:17 CST." <20020206182617.GB26519@leviathan.inethouston.net> X-Mailer: mh-e 5.0.92; MH 6.8.4; Emacs 21.1 Date: Wed, 06 Feb 2002 11:34:37 -0700 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 >>>>> "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. --lyndon To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-current" in the body of the message