From owner-freebsd-stable Wed Apr 17 12:21:50 2002 Delivered-To: freebsd-stable@freebsd.org Received: from 12-234-22-238.client.attbi.com (12-234-90-219.client.attbi.com [12.234.90.219]) by hub.freebsd.org (Postfix) with ESMTP id 5133937B400 for ; Wed, 17 Apr 2002 12:21:47 -0700 (PDT) Received: from Master.gorean.org (master.gorean.org [10.0.0.2]) by 12-234-22-238.client.attbi.com (8.12.2/8.12.2) with ESMTP id g3HJLlHt030320; Wed, 17 Apr 2002 12:21:47 -0700 (PDT) (envelope-from DougB@FreeBSD.org) Received: from Master.gorean.org (zoot [127.0.0.1]) by Master.gorean.org (8.12.2/8.12.2) with ESMTP id g3HJLnLr006770; Wed, 17 Apr 2002 12:21:49 -0700 (PDT) (envelope-from DougB@FreeBSD.org) Received: from localhost (doug@localhost) by Master.gorean.org (8.12.2/8.12.2/Submit) with ESMTP id g3HJLmJW006767; Wed, 17 Apr 2002 12:21:48 -0700 (PDT) X-Authentication-Warning: Master.gorean.org: doug owned process doing -bs Date: Wed, 17 Apr 2002 12:21:48 -0700 (PDT) From: Doug Barton X-X-Sender: doug@master.gorean.org To: Steve Watt Cc: stable@FreeBSD.org Subject: Re: mergmaster major weirdness In-Reply-To: <200204170831.g3H8VAUa012599@wattres.Watt.COM> Message-ID: <20020417121939.E4228-100000@master.gorean.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-stable@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG On Wed, 17 Apr 2002, Steve Watt wrote: > I just did a fresh update to -stable for the syncookie problem (and it's > been gosh, more than 2 months uptime on that box!), and besides the ATA > tags brokenness issue, I ran over another interesting problem. > > It appears that mergemaster *missed* a couple of files The code in mergemaster that handles these comparisons is very simple. for COMPFILE in `find . -type f -size +0`; do Therefore, if the files existed, and were of size greater than zero, mergemaster would have showed them to you. Lots of things are possible, such as you hitting 'd' twice instead of once, bugs in find, bugs in /usr/src/etc/Makefile.... -- "We have known freedom's price. We have shown freedom's power. And in this great conflict, ... we will see freedom's victory." - George W. Bush, President of the United States State of the Union, January 28, 2002 Do YOU Yahoo!? To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-stable" in the body of the message