CURRENT, usr/src on git, howto "mergemaster"?

Enji Cooper yaneurabeya at gmail.com
Mon Jan 4 19:27:52 UTC 2021


> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet <jbtakk at iherebuywisely.com> wrote:

…

>> Dear Enji,
>> 
>> 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.
>> 
>> 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’t mind helping resolve them, but unfortunately the concerns noted above are a bit nebulous.
Thank you!
-Enji


More information about the freebsd-current mailing list