From owner-freebsd-stable@FreeBSD.ORG Sat Jul 14 05:32:14 2007 Return-Path: X-Original-To: freebsd-stable@freebsd.org Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE55316A402 for ; Sat, 14 Jul 2007 05:32:14 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from mail2.fluidhosting.com (mx21.fluidhosting.com [204.14.89.4]) by mx1.freebsd.org (Postfix) with SMTP id 7FA5D13C442 for ; Sat, 14 Jul 2007 05:32:14 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: (qmail 1698 invoked by uid 399); 14 Jul 2007 05:32:14 -0000 Received: from localhost (HELO ?192.168.0.4?) (dougb@dougbarton.us@127.0.0.1) by localhost with ESMTP; 14 Jul 2007 05:32:14 -0000 X-Originating-IP: 127.0.0.1 Message-ID: <46985FD8.1020507@FreeBSD.org> Date: Fri, 13 Jul 2007 22:32:08 -0700 From: Doug Barton Organization: http://www.FreeBSD.org/ User-Agent: Thunderbird 2.0.0.4 (Windows/20070604) MIME-Version: 1.0 To: davidb@boothscientific.com References: <200707131618.21301.davidb@boothscientific.com> <4698544D.5030903@FreeBSD.org> <200707140022.14628.davidb@boothscientific.com> In-Reply-To: <200707140022.14628.davidb@boothscientific.com> X-Enigmail-Version: 0.95.2 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: freebsd-stable@freebsd.org Subject: Re: mergemaster failure 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, 14 Jul 2007 05:32:14 -0000 David Booth wrote: > I was able to solve the problem by re-running mergemaster with a clean > temproot directory so I guess that there was a problem there. Yeah, that'll do it too. You should always delete the old temproot when you start up with new source code. Doug -- This .signature sanitized for your protection