Date: Wed, 06 Feb 2002 11:34:37 -0700 From: Lyndon Nerenberg <lyndon@orthanc.ab.ca> To: "David W. Chapman Jr." <dwcjr@inethouston.net> Cc: Emiel Kollof <coolvibe@hackerheaven.org>, current@FreeBSD.ORG Subject: Re: Mergemaster niggle Message-ID: <200202061834.g16IYbx70840@orthanc.ab.ca> In-Reply-To: Your message of "Wed, 06 Feb 2002 12:26:17 CST." <20020206182617.GB26519@leviathan.inethouston.net>
next in thread | previous in thread | raw e-mail | index | archive | help
>>>>> "David" == David W Chapman <dwcjr@inethouston.net> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200202061834.g16IYbx70840>