From owner-freebsd-current@freebsd.org Mon Jan 4 19:42:32 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 8FDC84C8295; Mon, 4 Jan 2021 19:42:32 +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 4D8mHX2VC2z3tFM; Mon, 4 Jan 2021 19:42:32 +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 104JgTTP072503 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 4 Jan 2021 20:42:29 +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: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> From: Marek Zarychta Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <801fffb6-71f3-615a-0bef-6198f42ea27f@plan-b.pwste.edu.pl> Date: Mon, 4 Jan 2021 20:42:28 +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: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6M4QR2ddZOALNhWUCuPgtX9EDY7xg68D5" X-Rspamd-Queue-Id: 4D8mHX2VC2z3tFM 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:42:32 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --6M4QR2ddZOALNhWUCuPgtX9EDY7xg68D5 Content-Type: multipart/mixed; boundary="xo48gSPOmp5oseCW1kCDirUSUIF74x8o0"; protected-headers="v1" From: Marek Zarychta To: Enji Cooper Cc: FreeBSD Current , FreeBSD CURRENT Message-ID: <801fffb6-71f3-615a-0bef-6198f42ea27f@plan-b.pwste.edu.pl> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? References: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> In-Reply-To: <02D5B6C7-B8DB-415A-9376-6328C0431E55@gmail.com> --xo48gSPOmp5oseCW1kCDirUSUIF74x8o0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable W dniu 04.01.2021 o=C2=A020:27, Enji Cooper pisze: >=20 >> On Jan 4, 2021, at 11:15 AM, Jeffrey Bouquet wrote: >=20 > =E2=80=A6 >=20 >>> 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 potent= ial >>> security hole in the system. >=20 > Hi Jeffrey and Marek, > Could you please be more specific in your concerns? I don=E2=80=99t mi= nd helping resolve them, but unfortunately the concerns noted above are a= bit nebulous. Dear Enji, 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. Kind regards, --=20 Marek Zarychta --xo48gSPOmp5oseCW1kCDirUSUIF74x8o0-- --6M4QR2ddZOALNhWUCuPgtX9EDY7xg68D5 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/zb6QFAwAAAAAACgkQdZ/s//1SjSwn XggAsONR5GIuL5sJpzcGH5xAj/H/DZeccAkaYEThr+egr5vEwVFL0vQvFpqLT6MFfwPMVrXK0W68 ovwE/sXfzmSoAK58/46ibuEupBc04ng/soOGtPu5K6kWsFZHG5poA8WGa4jg9QPe+syZziiH7bVi 7XDLk4CG7014sPytkF7oQcGhDTJLC2Zlt/RWvyhbGkXucxJ8YwhwkoNX0IMoHLqCvak54QoQoZfI W5plMRgYvkSkSR1tJx1t+JMmMi/kq+6/VygH9znVl+xRuRd/QjxXO8nPebeTtJQfsU7aUJz0vkdQ etprU9aOteNaIGuKN2n5DsuuFkXopZFa1uzdrrEldg== =dLwT -----END PGP SIGNATURE----- --6M4QR2ddZOALNhWUCuPgtX9EDY7xg68D5--