From owner-freebsd-current@FreeBSD.ORG Mon Nov 26 13:33:09 2007 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C664716A417 for ; Mon, 26 Nov 2007 13:33:09 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (tim.des.no [194.63.250.121]) by mx1.freebsd.org (Postfix) with ESMTP id 8698213C478 for ; Mon, 26 Nov 2007 13:33:09 +0000 (UTC) (envelope-from des@des.no) Received: from tim.des.no (localhost [127.0.0.1]) by spam.des.no (Postfix) with ESMTP id 639DC2089; Mon, 26 Nov 2007 14:33:00 +0100 (CET) X-Spam-Tests: AWL X-Spam-Learn: disabled X-Spam-Score: -0.1/3.0 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) on tim.des.no Received: from ds4.des.no (des.no [80.203.243.180]) by smtp.des.no (Postfix) with ESMTP id 2EBEC2083; Mon, 26 Nov 2007 14:32:59 +0100 (CET) Received: by ds4.des.no (Postfix, from userid 1001) id BB7A784485; Mon, 26 Nov 2007 14:32:59 +0100 (CET) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: "Aryeh M. Friedman" References: <4744F590.80702@gmail.com> Date: Mon, 26 Nov 2007 14:32:59 +0100 In-Reply-To: <4744F590.80702@gmail.com> (Aryeh M. Friedman's message of "Wed\, 21 Nov 2007 22\:20\:48 -0500") Message-ID: <86ejed3zec.fsf@ds4.des.no> User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/22.1 (berkeley-unix) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Cc: freebsd-current@freebsd.org Subject: Re: PATCH: prevent mergemaster from doing a "make builldworld" X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 26 Nov 2007 13:33:09 -0000 "Aryeh M. Friedman" writes: > Patch attached. The patch is nonsense; what your -M option actually does is disable mergemaster (by preventing the tmproot from being populated) The real bug is that you either specified the wrong source directory to mergemaster, or had SOURCEDIR defined in your environment. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@des.no