From owner-freebsd-current Mon Feb 11 19:45:24 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 4E1DD37B506 for ; Mon, 11 Feb 2002 18:18:44 -0800 (PST) Received: from okeeffe.bestweb.net (okeefe.bestweb.net [209.94.100.110]) by newman2.bestweb.net (Postfix) with ESMTP id 67E65231A4; Mon, 11 Feb 2002 21:17:50 -0500 (EST) Received: by okeeffe.bestweb.net (Postfix, from userid 0) id 501199F380; Mon, 11 Feb 2002 21:12:34 -0500 (EST) Date: Wed, 6 Feb 2002 12:26:17 -0600 From: "David W. Chapman Jr." To: Emiel Kollof Cc: current@freebsd.org Subject: Re: Mergemaster niggle Reply-To: "David W. Chapman Jr." Message-Id: <20020212021234.501199F380@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 > 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. dwcjr@freebsd.org FreeBSD Committer 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