Date: Mon, 4 Jan 2021 11:27:48 -0800 From: Enji Cooper <yaneurabeya@gmail.com> To: Jeffrey Bouquet <jbtakk@iherebuywisely.com> Cc: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>, FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> In-Reply-To: <E1kwVJz-0001q4-AS@rmmprod05.runbox> References: <E1kwVJz-0001q4-AS@rmmprod05.runbox>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet = <jbtakk@iherebuywisely.com> wrote: =E2=80=A6 >> Dear Enji, >>=20 >> to satisfy your curiosity: Yes, I have tried etcupdate(8) a few times >> over years. It works fine, but I don't like the idea of editing >> conflicted files. >>=20 >> I won't complain about etcupdate(8), but please leave mergemaster(8) >> as is. I believe we need both: solid, fast black boxes driven it auto >> mode and fragile tools in the base. mergemaser is rather not a = potential >> security hole in the system. Hi Jeffrey and Marek, Could you please be more specific in your concerns? I don=E2=80=99= t mind helping resolve them, but unfortunately the concerns noted above = are a bit nebulous. Thank you! -Enji=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?02D5B6C7-B8DB-415A-9376-6328C0431E55>