From owner-freebsd-stable@FreeBSD.ORG Fri Aug 9 14:12:14 2013 Return-Path: Delivered-To: freebsd-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 9DF8EED1; Fri, 9 Aug 2013 14:12:14 +0000 (UTC) (envelope-from Devin.Teske@fisglobal.com) Received: from mx1.fisglobal.com (mx1.fisglobal.com [199.200.24.190]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6865A2A82; Fri, 9 Aug 2013 14:12:14 +0000 (UTC) Received: from smtp.fisglobal.com ([10.132.206.15]) by ltcfislmsgpa02.fnfis.com (8.14.5/8.14.5) with ESMTP id r79EBwZ4015626 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Fri, 9 Aug 2013 09:11:58 -0500 Received: from LTCFISWMSGMB21.FNFIS.com ([169.254.1.135]) by LTCFISWMSGHT04.FNFIS.com ([10.132.206.15]) with mapi id 14.02.0309.002; Fri, 9 Aug 2013 09:11:57 -0500 From: "Teske, Devin" To: "" Subject: [SOLVED] Re: missing /boot/menusets.4th Thread-Topic: [SOLVED] Re: missing /boot/menusets.4th Thread-Index: AQHOlNtIxSBVVLVSR0OrUtYsurGrUpmM9yKAgABHyYA= Date: Fri, 9 Aug 2013 14:11:57 +0000 Message-ID: <13CA24D6AB415D428143D44749F57D720200D19F@ltcfiswmsgmb21> References: <5204BC75.9090705@lidstrom.eu> In-Reply-To: <5204BC75.9090705@lidstrom.eu> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.132.253.126] Content-Type: text/plain; charset="iso-8859-1" Content-ID: <4A40EBCFE5DA654B8065A979A7EF8EBA@fisglobal.com> Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.10.8794, 1.0.431, 0.0.0000 definitions=2013-08-09_06:2013-08-09,2013-08-09,1970-01-01 signatures=0 Cc: Devin Teske , freebsd-stable stable X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: Devin Teske List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 09 Aug 2013 14:12:14 -0000 On Aug 9, 2013, at 2:55 AM, Henrik Lidstr=F6m wrote: > On 08/09/13 10:28, Daniel Braniss wrote: >> as of now (sorry have no rev#) the file >> sys/boot/forth/menusets.4th >> is not being installed, so boot failes! >>=20 >> danny >>=20 >>=20 >> _______________________________________________ >> freebsd-stable@freebsd.org mailing list >> http://lists.freebsd.org/mailman/listinfo/freebsd-stable >> To unsubscribe, send any mail to "freebsd-stable-unsubscribe@freebsd.org" >=20 > Yep, I just recovered from it using fixit and copying the file from src t= o /boot. >=20 > FreeBSD 149999HELI 9.2-BETA2 FreeBSD 9.2-BETA2 #7: Fri Aug 9 10:43:22 CE= ST 2013 root@149999HELI:/usr/obj/usr/src/sys/JOBBD2 amd64 >=20 (raises hand) My fault! I committed SVN r254109/r254113. ... and forgot to merge r242688. And I know why I missed it... Learned a valuable lessen today... *** I did my "mergeinfo --show-revs=3Deligible" in sys/boot/forth *** NOTE: Despite the fact that I did "svn merge" in the proper location, the "= show-revs" was influenced by the fact that I was in a sub-directory ... thu= s I never caught r242688 because at that sub-directory level, the revision = didn't apply (show-revs=3Deligible didn't list it; and that's the list I wa= s processing). It's not that I wasn't paying close attention to... http://www.freebsd.org/doc/en_US.ISO8859-1/articles/committers-guide/subver= sion-primer.html It's that I didn't know that the rule of getting the list of eligible revs = was quite as important as the actual act of merging. I'm very aware now tha= t when you go to synchronize branches... it's imperative that even the show= -revs step be done at the right level (but to be fair... I wasn't expecting= something like r242688 ... and it had been a _long_ time since I had last = broke the build [albeit with the same problem in HEAD]). Much apologies. Merging r242688 immediately to stable/9 to fix the missing file issue. --=20 Devin _____________ The information contained in this message is proprietary and/or confidentia= l. If you are not the intended recipient, please: (i) delete the message an= d all copies; (ii) do not disclose, distribute or use the message in any ma= nner; and (iii) notify the sender immediately. In addition, please be aware= that any message addressed to our domain is subject to archiving and revie= w by persons other than the intended recipient. Thank you.