Date: Mon, 4 Jan 2021 20:13:03 +0100 From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: Enji Cooper <yaneurabeya@gmail.com> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <ffdb5ba7-537d-166b-1eb6-3628f51cf8ac@plan-b.pwste.edu.pl> In-Reply-To: <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com> References: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> <2B92ACC3-D40D-4456-BB53-98938348E13F@gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --nTQCDjeFgbHgm3qTXvEQtZ6tMYc7Vg3aH Content-Type: multipart/mixed; boundary="f0gKyRQtrry9iXIQpLNPTZVHKKKs9GPGF"; protected-headers="v1" From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: Enji Cooper <yaneurabeya@gmail.com> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Message-ID: <ffdb5ba7-537d-166b-1eb6-3628f51cf8ac@plan-b.pwste.edu.pl> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? References: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <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 <zarychtam@plan-b.pwste.ed= u.pl> 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 <http://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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ffdb5ba7-537d-166b-1eb6-3628f51cf8ac>