From owner-freebsd-current@freebsd.org Fri May 17 17:58:34 2019 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 724FA159BEA5 for ; Fri, 17 May 2019 17:58:34 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [198.144.209.73]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 87D8385E81 for ; Fri, 17 May 2019 17:58:33 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.15.2/8.15.2) with ESMTP id x4HHwVdd084473; Fri, 17 May 2019 17:58:31 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.15.2/8.15.2/Submit) id x4HHwVfd084472; Fri, 17 May 2019 10:58:31 -0700 (PDT) (envelope-from david) Date: Fri, 17 May 2019 10:58:31 -0700 From: David Wolfskill To: Pete Wright Cc: FreeBSD Current Subject: Re: mergemaster still having issues Message-ID: <20190517175831.GO79998@albert.catwhisker.org> Mail-Followup-To: David Wolfskill , Pete Wright , FreeBSD Current References: <20190517175155.GN79998@albert.catwhisker.org> <695f979f-4253-75bf-8226-428b89fbd398@nomadlogic.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="Wfe1KbQWcwuymTys" Content-Disposition: inline In-Reply-To: <695f979f-4253-75bf-8226-428b89fbd398@nomadlogic.org> User-Agent: Mutt/1.11.4 (2019-03-13) X-Rspamd-Queue-Id: 87D8385E81 X-Spamd-Bar: -------- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 198.144.209.73 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-8.93 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; URIBL_BLOCKED(0.00)[catwhisker.org.multi.uribl.com]; FROM_HAS_DN(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:198.144.209.73]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; DMARC_NA(0.00)[catwhisker.org]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; MX_GOOD(-0.01)[cached: mx.catwhisker.org]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[73.209.144.198.list.dnswl.org : 127.0.10.0]; NEURAL_HAM_SHORT(-0.95)[-0.952,0]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+]; ASN(0.00)[asn:7961, ipnet:198.144.192.0/19, country:US]; RCVD_TLS_LAST(0.00)[]; IP_SCORE(-3.56)[ip: (-9.46), ipnet: 198.144.192.0/19(-4.61), asn: 7961(-3.69), country: US(-0.06)] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 17 May 2019 17:58:34 -0000 --Wfe1KbQWcwuymTys Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, May 17, 2019 at 10:55:18AM -0700, Pete Wright wrote: > ...=20 > > E.g.: > > pushd usr.bin/mergemaster && make install; popd > > > > Then re-start the userland installation (e.g., "mergemaster -p ...") and > > proceed with the rest of the install as usual. >=20 > Ah OK, i think missed that in the thread - and the promised update to=20 > the UPDATING file in the commit doesn't seem to have landed yet either. >=20 > Thanks David! > -pete > .... Above is from working/experimenting with Brad; my sense is that things aren't quite settled yet (with respect to UPDATING recommendations). Happy to help when I can. :-) Peace, david --=20 David H. Wolfskill david@catwhisker.org One wonders just who benefits from Trump's trade war with China. See http://www.catwhisker.org/~david/publickey.gpg for my public key. --Wfe1KbQWcwuymTys Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAlze9kdfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PclM1gf/alD4WvebmrBlpIFtibDAy8leMdU+EIIXBOSmbz0l3daZ3KjZM2WXnWev 8eAOtsa4N+AIn8/4zT7KeKc0g4yTKQ767HclokCxVlgzNp0fPT4Muk8OxY+PD0my wjpWIVM4kjErl/6b37s9V3cGq6XJ2C1hKUBgKeIJBd5w7n9vX1BmVoLKQQfLKWcg 2xOFxt8Y72zbB9d9izkfFBIpHcQbPLEBdvWNjzoP6QabLNzEV/nBe/JAnQuFKZha lxXgSiz1n92DY5Ewa+gV+CAJPK8wENdZ2skJNyhu32KLCd5YYl+MOAaGSFOk71yt iCI8D8++3QJc/dOb8mCZ5aoJ5Rk4/Q== =Megk -----END PGP SIGNATURE----- --Wfe1KbQWcwuymTys--