Date: Mon, 4 Jan 2021 11:47:53 -0800 From: Enji Cooper <yaneurabeya@gmail.com> To: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <57610DB3-A575-4851-AFBC-ABC362F89924@gmail.com> In-Reply-To: <801fffb6-71f3-615a-0bef-6198f42ea27f@plan-b.pwste.edu.pl> References: <E1kwVJz-0001q4-AS@rmmprod05.runbox> <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> <801fffb6-71f3-615a-0bef-6198f42ea27f@plan-b.pwste.edu.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Jan 4, 2021, at 11:42 AM, Marek Zarychta = <zarychtam@plan-b.pwste.edu.pl> wrote: =E2=80=A6 > it's probably high time to stop escalating this thread. Some people = like > the way in which mergemaster copes with updates, some people like > etcupdate. With Git clean and smudge filters applied on local repo and > $FreeBSD$ IDs regenerated, mergemaster still works great and is more > ergonomic in use for at least two people. Hi Marek, I don=E2=80=99t take offense to your concerns. I=E2=80=99m just = trying to be direct and understand gaps there possibly are that can be = filled in in etcupdate(8). Your and others=E2=80=99 feedback is = appreciated. Thanks so much, -Enji PS While I admit that smudge filters are possible for managing diffs = with mergemaster (and I think it=E2=80=99s a novel solution =E2=80=94 = I=E2=80=99ve never heard of that before), not everyone should have to = set those up to use a core configuration tool. I find things like that = unfortunate gaps in the tooling that drives away users instead of = attracts them. I personally prefer focusing less on the nits and writing = bespoke code for system administration, so I can focus on things which = matter more to me in my life: people and nature.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?57610DB3-A575-4851-AFBC-ABC362F89924>