Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 17 May 2019 10:58:31 -0700
From:      David Wolfskill <david@catwhisker.org>
To:        Pete Wright <pete@nomadlogic.org>
Cc:        FreeBSD Current <freebsd-current@freebsd.org>
Subject:   Re: mergemaster still having issues
Message-ID:  <20190517175831.GO79998@albert.catwhisker.org>
In-Reply-To: <695f979f-4253-75bf-8226-428b89fbd398@nomadlogic.org>
References:  <eb4e8508-6792-e91d-cf29-45ef6760c77e@nomadlogic.org> <20190517175155.GN79998@albert.catwhisker.org> <695f979f-4253-75bf-8226-428b89fbd398@nomadlogic.org>

next in thread | previous in thread | raw e-mail | index | archive | help

--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--



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190517175831.GO79998>