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

From: Chris <bsd-lists_at_bsdforge.com>
Date: Mon, 04 Jan 2021 11:40:03 -0800
On 2021-01-04 11:13, Marek Zarychta wrote:
> W dniu 04.01.2021 o 19:54, Enji Cooper pisze:
>> 
>>> On Jan 4, 2021, at 10:49 AM, Marek Zarychta 
>>> <zarychtam_at_plan-b.pwste.edu.pl> wrote:
>> 
>> …
>> 
>>> Terrible idea IMHO, but I am only the weak voice from the userbase.
>>> 
>>> It's like deprecating old, well-worn hammer in the favour of the nail
>>> gun. Why not deprecate biff(1), pom(6), nvi(1) etc.?
>> 
>> Marek,
>> 	I’m curious: have you used etcupdate before instead of mergemaster? If so 
>> when? If you ran into issues (UX as well as functional): could you please 
>> report them on bugs.freebsd.org <http://bugs.freebsd.org/> ?
>> 	etcupdate is a less fragile tool that’s broken my systems less when 
>> compared with mergemaster.
> 
> 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.
You might find it in your best interest to adopt (become a maintainer) for
mergemaster(8). This would allow you to fix whatever ailments have arrived
over the years, and better adapt it to work with the newly adopted git(1) SCM
that is now the source of truth for /usr/src. :-)

--Chris
> 
> With kind regards,
Received on Mon Jan 04 2021 - 18:40:07 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:26 UTC