From owner-freebsd-stable@FreeBSD.ORG Sat May 16 23:13:16 2009 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2A007106566C for ; Sat, 16 May 2009 23:13:16 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx24.fluidhosting.com [204.14.89.7]) by mx1.freebsd.org (Postfix) with ESMTP id AD7C18FC16 for ; Sat, 16 May 2009 23:13:15 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 24253 invoked by uid 399); 16 May 2009 23:13:14 -0000 Received: from localhost (HELO foreign.dougb.net) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTPAM; 16 May 2009 23:13:14 -0000 X-Originating-IP: 127.0.0.1 X-Sender: dougb@dougbarton.us Message-ID: <4A0F4888.3070709@FreeBSD.org> Date: Sat, 16 May 2009 16:13:12 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.21 (X11/20090423) MIME-Version: 1.0 To: Daniel Gerzo References: <20090504225012.392fa49f.torfinn.ingolfsen@broadpark.no> <49FF5901.600@gmail.com> <49FFEECE.20403@FreeBSD.org> In-Reply-To: <49FFEECE.20403@FreeBSD.org> X-Enigmail-Version: 0.95.7 OpenPGP: id=D5B2F0FB Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Torfinn Ingolfsen , freebsd-stable@freebsd.org, Manolis Kiagias Subject: Re: RELENG_7 - has mergemaster changed logic since 7.2-RELEASE? X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 May 2009 23:13:16 -0000 I think I now know what was causing the problem with the files being overwritten, the saved mtree database was somehow reduced to zero bytes causing the list of CHANGED files to be empty. Unfortunately I haven't tracked down the cause of why the mtree file would get emptied out (given that there is already code that should prevent that problem) but I have just committed r192230 which adds a lot of safety belts to the code involving creating and updating the mtree database, and creating and using the list of files with changes. It should no longer be possible to even enter the -U code unless there is both a valid mtree file AND a valid list of files with local changes. FWIW I've also improved the performance of the -U option by changing a use of grep for every file to using case. You should be able to grab the file from HEAD and run it on RELENG_[67] without any problems. I will MFC it as rapidly as possible. Sorry for the inconvenience, Doug -- This .signature sanitized for your protection