From owner-freebsd-current@freebsd.org Mon Jan 4 19:40:07 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 BA8094C7B42; Mon, 4 Jan 2021 19:40:07 +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 4D8mDl3Gbfz3sBm; Mon, 4 Jan 2021 19:40:07 +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 104Je3Vk051675; Mon, 4 Jan 2021 11:40:09 -0800 (PST) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Mon, 04 Jan 2021 11:40:03 -0800 From: Chris To: Marek Zarychta Cc: Enji Cooper , FreeBSD Current , FreeBSD CURRENT Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? In-Reply-To: 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> User-Agent: UDNSMS/17.0 Message-ID: X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4D8mDl3Gbfz3sBm 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:40:07 -0000 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 >>> 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. > > 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,