From owner-freebsd-current@freebsd.org Mon Jan 4 19:13:06 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 45A924C384D; Mon, 4 Jan 2021 19:13:06 +0000 (UTC) (envelope-from zarychtam@plan-b.pwste.edu.pl) Received: from plan-b.pwste.edu.pl (plan-b.pwste.edu.pl [IPv6:2001:678:618::40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "plan-b.pwste.edu.pl", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8ldZ0LSJz3nSd; Mon, 4 Jan 2021 19:13:05 +0000 (UTC) (envelope-from zarychtam@plan-b.pwste.edu.pl) Received: from fomalhaut.potoki.eu ([IPv6:2001:470:71:d47:e50a:9397:cf91:e1d6]) (authenticated bits=0) by plan-b.pwste.edu.pl (8.16.1/8.16.1) with ESMTPSA id 104JD3n7064461 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 4 Jan 2021 20:13:04 +0100 (CET) (envelope-from zarychtam@plan-b.pwste.edu.pl) X-Authentication-Warning: plan-b.pwste.edu.pl: Host [IPv6:2001:470:71:d47:e50a:9397:cf91:e1d6] claimed to be fomalhaut.potoki.eu To: Enji Cooper Cc: FreeBSD Current , FreeBSD CURRENT 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> From: Marek Zarychta Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: Date: Mon, 4 Jan 2021 20:13:03 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="nTQCDjeFgbHgm3qTXvEQtZ6tMYc7Vg3aH" X-Rspamd-Queue-Id: 4D8ldZ0LSJz3nSd 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:13:06 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --nTQCDjeFgbHgm3qTXvEQtZ6tMYc7Vg3aH Content-Type: multipart/mixed; boundary="f0gKyRQtrry9iXIQpLNPTZVHKKKs9GPGF"; protected-headers="v1" From: Marek Zarychta To: Enji Cooper Cc: FreeBSD Current , FreeBSD CURRENT Message-ID: Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? 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> In-Reply-To: <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com> --f0gKyRQtrry9iXIQpLNPTZVHKKKs9GPGF Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable 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): coul= d 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. 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. With kind regards, --=20 Marek Zarychta --f0gKyRQtrry9iXIQpLNPTZVHKKKs9GPGF-- --nTQCDjeFgbHgm3qTXvEQtZ6tMYc7Vg3aH Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsB5BAABCAAjFiEEMOqvKm6wKvS1/ZeCdZ/s//1SjSwFAl/zaL8FAwAAAAAACgkQdZ/s//1SjSzO nwf8CP1N0oIrgLViZ8cw/PhakIQABjtaSIEYV+1Pu0gNXJPpg0g8aPwJzjYR4nHYSiDlFyxXQCn0 DfNnyQ+SydHSLWSF4OYrw6G6IzPBub30pp/IxnZwL5+4jGBRsOBQgFm9CLfmND0GIR0qkreXHJUa tbAy/Cl9FHZQNh6m6eZc9vGJhxZU9XXesoL3Pb3LMpiTPnznxZrJHnT8hi2PT0BdtUILEDwEj6BF BmYp981N3fdfmrCIciPJhp/o1k3BZcOxvYNN8peQj1kAON5xVIUyHFK2RBolz0ulj6JenSat3RpP 51CjqksIesOD9v8W9FKsucAYGNheLQMm4cG8/+t5Iw== =s0h9 -----END PGP SIGNATURE----- --nTQCDjeFgbHgm3qTXvEQtZ6tMYc7Vg3aH--