Date: Fri, 9 Aug 2013 14:11:57 +0000 From: "Teske, Devin" <Devin.Teske@fisglobal.com> To: "<freebsd@lidstrom.eu>" <freebsd@lidstrom.eu> Cc: Devin Teske <dteske@freebsd.org>, freebsd-stable stable <freebsd-stable@freebsd.org> Subject: [SOLVED] Re: missing /boot/menusets.4th Message-ID: <13CA24D6AB415D428143D44749F57D720200D19F@ltcfiswmsgmb21> In-Reply-To: <5204BC75.9090705@lidstrom.eu> References: <E1V7i3Q-0009aG-NU@kabab.cs.huji.ac.il> <5204BC75.9090705@lidstrom.eu>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?13CA24D6AB415D428143D44749F57D720200D19F>