From owner-freebsd-current@freebsd.org Mon Jan 4 19:32:23 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 565934C7854; Mon, 4 Jan 2021 19:32:23 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "ultimatedns.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8m3q0YRqz3rmY; Mon, 4 Jan 2021 19:32:22 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 104JWG2j058562; Mon, 4 Jan 2021 11:32:22 -0800 (PST) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Mon, 04 Jan 2021 11:32:16 -0800 From: Chris To: Enji Cooper Cc: Marek Zarychta , Warner Losh , FreeBSD Current , FreeBSD CURRENT Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? In-Reply-To: <15C691A6-1944-42EC-B64B-5873DFE2CB60@gmail.com> References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com> <15C691A6-1944-42EC-B64B-5873DFE2CB60@gmail.com> User-Agent: UDNSMS/17.0 Message-ID: <3ec92cb86fe38148e69e2f6d21bca787@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D8m3q0YRqz3rmY X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 19:32:23 -0000 On 2021-01-04 10:58, Enji Cooper wrote: >> On Jan 4, 2021, at 10:54 AM, Enji Cooper wrote: >> >> >>> On Jan 4, 2021, at 10:49 AM, Marek Zarychta >> > 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 ? >> 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. TBH I've continued to use mergemaster simply out of habit, because it was the recommended/supported way of doing it from UPDATING. It started acting odd awhile back. So I went to performing mergemaster -viF to simply burn through the $Id only changes. Then diff(1)ing the the 2 trees to create a mega-patch which I could apply. I took that route with the intention of coming back to it to discover what the problem was. But never got around to it. I'm *really* glad this thread came about. Now I can move onto something that actually works as intended -- assuming /etc/(group|passwd) bits get merged. :-) --Chris > > Cheers, > -Enji > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org"