Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jan 2021 10:58:08 -0800
From:      Enji Cooper <yaneurabeya@gmail.com>
To:        Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
Cc:        Warner Losh <imp@bsdimp.com>, FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org>
Subject:   Re: CURRENT, usr/src on git, howto "mergemaster"?
Message-ID:  <15C691A6-1944-42EC-B64B-5873DFE2CB60@gmail.com>
In-Reply-To: <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com>
References:  <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com>

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


> On Jan 4, 2021, at 10:54 AM, Enji Cooper <yaneurabeya@gmail.com> wrote:
> 
> 
>> On Jan 4, 2021, at 10:49 AM, Marek Zarychta <zarychtam@plan-b.pwste.edu.pl <mailto:zarychtam@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.

That reminds me, there is a feature gap (in the last 5~10 years I’ve used etcupdate) that I forgot about between mergemaster and etcupdate: in particular, mergemaster works when adding/removing new users and groups from /etc/passwd* and /etc/group, respectively, dealing with mtree files, the last time I checked. Apart from that, I don’t see a use for mergemaster (and in which case, the feature gap can be trimmed down/migrated to etcupdate). mergemaster has broken the configuration of my machines/VMs more than etcupdate has ever and I’ve used both tools for about the same time.

Cheers,
-Enji

help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?15C691A6-1944-42EC-B64B-5873DFE2CB60>