From owner-freebsd-current@freebsd.org Mon Jan 4 19:15:18 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 F3B974C3C83; Mon, 4 Jan 2021 19:15:18 +0000 (UTC) (envelope-from jbtakk@iherebuywisely.com) Received: from aibo.runbox.com (aibo.runbox.com [91.220.196.211]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8lh662MRz3ntb; Mon, 4 Jan 2021 19:15:18 +0000 (UTC) (envelope-from jbtakk@iherebuywisely.com) Received: from [10.9.9.127] (helo=rmmprod05.runbox) by mailtransmit02.runbox with esmtp (Exim 4.86_2) (envelope-from ) id 1kwVJz-0007T5-DD; Mon, 04 Jan 2021 20:15:15 +0100 Received: from mail by rmmprod05.runbox with local (Exim 4.86_2) (envelope-from ) id 1kwVJz-0001q4-AS; Mon, 04 Jan 2021 20:15:15 +0100 Content-Type: text/plain; charset="utf-8" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received: from [Authenticated alias (650894)] by runbox.com with http (RMM6); Mon, 04 Jan 2021 19:15:15 GMT From: "Jeffrey Bouquet" To: "Marek Zarychta" CC: "Enji Cooper" , "FreeBSD Current" , "FreeBSD CURRENT" Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Date: Mon, 04 Jan 2021 11:15:15 -0800 (PST) X-RMM-Aliasid: 650894 X-Mailer: RMM6 In-Reply-To: Message-Id: X-Rspamd-Queue-Id: 4D8lh662MRz3ntb 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:15:19 -0000 On Mon, 4 Jan 2021 20:13:03 +0100, Marek Zarychta wrote: > W dniu 04.01.2021 o=C2=A019:54, Enji Cooper pisze: > >=20 > >> On Jan 4, 2021, at 10:49 AM, Marek Zarychta wrote: > >=20 > > =E2=80=A6 > >=20 > >> 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.? > >=20 > > Marek, > > I=E2=80=99m curious: have you used etcupdate before instead of mergema= ster? 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=E2=80=99s broken my systems less= when compared with mergemaster. >=20 > Dear Enji, >=20 > 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. >=20 > 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. >=20 > With kind regards, >=20 > --=20 > Marek Zarychta +1=20=