Date: Wed, 6 Feb 2002 12:26:17 -0600 From: "David W. Chapman Jr." <dwcjr@inethouston.net> To: Emiel Kollof <coolvibe@hackerheaven.org> Cc: current@freebsd.org Subject: Re: Mergemaster niggle Message-ID: <20020206182617.GB26519@leviathan.inethouston.net> In-Reply-To: <81B8D72A-1B16-11D6-A0EA-000A277C7FDE@hackerheaven.org> References: <81B8D72A-1B16-11D6-A0EA-000A277C7FDE@hackerheaven.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> Diffs like there show up for COUNTLESS times in mergemaster. In fact, > nothing changed except the cvs id. Why am I asked about these in > mergemaster? Is there a way to ignore files that only have the cvsid > changed? This would speed up the mergemaster run considerably... > mergemaster only checks to see if RCSID's are different by default, I forget which option, but there is one to actually diff the two files when doing its inital compare, but the RCSID's would be different so I'm not sure it would help you. -- David W. Chapman Jr. dwcjr@inethouston.net Raintree Network Services, Inc. <www.inethouston.net> dwcjr@freebsd.org FreeBSD Committer <www.FreeBSD.org> 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?20020206182617.GB26519>