From owner-freebsd-current@freebsd.org Mon Jan 4 18:33:16 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 ADAED4DF855 for ; Mon, 4 Jan 2021 18:33:16 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4D8klc3fG0z3h5B for ; Mon, 4 Jan 2021 18:33:16 +0000 (UTC) (envelope-from david@catwhisker.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7D25A4DF854; Mon, 4 Jan 2021 18:33:16 +0000 (UTC) Delivered-To: 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 7CEC94DFBE3 for ; Mon, 4 Jan 2021 18:33:16 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8klc1qxMz3hGy for ; Mon, 4 Jan 2021 18:33:15 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 104IX83Q016757; Mon, 4 Jan 2021 18:33:08 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 104IX8ue016756; Mon, 4 Jan 2021 10:33:08 -0800 (PST) (envelope-from david) Date: Mon, 4 Jan 2021 10:33:08 -0800 From: David Wolfskill To: Enji Cooper Cc: current@freebsd.org Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: Reply-To: current@freebsd.org Mail-Followup-To: current@freebsd.org, Enji Cooper References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="olSbeb/1Du6tt88X" Content-Disposition: inline In-Reply-To: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> X-Rspamd-Queue-Id: 4D8klc1qxMz3hGy 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 18:33:16 -0000 --olSbeb/1Du6tt88X Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: > ...=20 > Adding to this: it has no maintainer, it=E2=80=99s less featureful, and i= t lacks tests. Once I switched to etcupdate a few years back I never looked= back at mergemaster. >=20 > I honestly think it should be deprecated in 13.x and removed in 14.x. It= =E2=80=99s been several major releases since it=E2=80=99s been unofficially= deprecated. >=20 > -Enji > .... All of which is fine, but at some point prior to that, perhaps src/UPDATING's instructions that cite its use might merit a change to reflect the use of a supported tool? Peace, david --=20 David H. Wolfskill david@catwhisker.org Real "RINOs": Donald Trump and his acolytes (e.g., Ted Cruz; Josh Hawley). See https://www.catwhisker.org/~david/publickey.gpg for my public key. --olSbeb/1Du6tt88X Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAl/zX2RfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnaYwf+PctNiLGSQ5vEwa1zMlA8KXPgYmM/PYo+K7VYWjzkCh/v1SBtqHSsJeBv WC405A5YtE2upF7Vdvb045ppxGVh4kigCkiT+V8IRHmm6Z0nDbFQ5gAKqYbdnQDZ +KUyDwuPz4JMrsXpr9hlglUVIW5tt3jtgkIVPHKxy2eKpwoF7AjTV3Pls3r8h/Pd Q+YUtZa/kI5muQR8Yu+R5FWnK61Y+lBgWhhQMEYztZUz4ASsNe4PGqM6Ex5PhD21 IGF9OLfbgrl5WGc9/EFLcIBjUsR6loMJP38JEp+CopxhPmzF3EFq/hKbUuxbPT3w XrESbbn1FT+JG0myNLzNuWXTxZEOiw== =FSYk -----END PGP SIGNATURE----- --olSbeb/1Du6tt88X--