From owner-freebsd-current@freebsd.org Mon Jan 4 18:49:17 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 1EBA04C074A; Mon, 4 Jan 2021 18:49:17 +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 4D8l646KTqz3jZ9; Mon, 4 Jan 2021 18:49:16 +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 104InAvB059649 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 4 Jan 2021 19:49:11 +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 , Warner Losh Cc: FreeBSD Current , FreeBSD CURRENT References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> From: Marek Zarychta Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> Date: Mon, 4 Jan 2021 19:49:09 +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: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0MKP10WDH16bity0GoL540BZWFSZkEJQD" X-Rspamd-Queue-Id: 4D8l646KTqz3jZ9 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:49:17 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --0MKP10WDH16bity0GoL540BZWFSZkEJQD Content-Type: multipart/mixed; boundary="IyZeTT2aC8MQUySkNIiyV059uLHeCC6io"; protected-headers="v1" From: Marek Zarychta To: Enji Cooper , Warner Losh Cc: FreeBSD Current , FreeBSD CURRENT Message-ID: <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> In-Reply-To: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> --IyZeTT2aC8MQUySkNIiyV059uLHeCC6io Content-Type: text/plain; charset=utf-8 Content-Language: pl Content-Transfer-Encoding: quoted-printable W dniu 04.01.2021 o=C2=A019:30, Enji Cooper pisze: >=20 >> On Jan 4, 2021, at 10:19, Warner Losh wrote: >> >> =EF=BB=BFOn Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta >> wrote: >> >>> W dniu 04.01.2021 o 17:14, Warner Losh pisze: >>> >>>> etcupdate does a full three merge, while mergemaster fakes it in a n= umber >>>> of ways. etcupdate directly keeps track of the resolutions, which is= why >>>> $FreeBSD$ doesn't matter so much to it. >>>> >>>> mergemaster is deprecated and will likely be removed from the system= >>>> because it has no maintainer and is quite a bit harder to keep worki= ng >>> than >>>> etcupdate. >>>> >>> >>> Please don't sacrifice mergemaster(8) for the successful transition t= o >>> Git. The amount of feedback on the mailing list should give the core@= >>> some idea of how widely mergemasted is still deployed. Some people ju= st >>> like to merge files side by side with pressing keys. Why innocent >>> mergemaster(8) has to be a victim of switching to Git? Sacrifice plea= se >>> svnlite(1) - it became completely useless for HEAD and upcoming stabl= e >>> branches. >>> >> >> mergemaster has been on its way out since well before the switch to gi= t. >> It's been disfavored for at least a decade and basically unmaintained = in >> the base for maybe last 5 years. Apart from major breakage, only doc >> changes have happened in that time. >=20 > Adding to this: it has no maintainer, it=E2=80=99s less featureful, and= it lacks tests. Once I switched to etcupdate a few years back I never lo= oked back at mergemaster. >=20 > I honestly think it should be deprecated in 13.x and removed in 14.x. I= t=E2=80=99s been several major releases since it=E2=80=99s been unofficia= lly deprecated. >=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.? Kind regards, --=20 Marek Zarychta --IyZeTT2aC8MQUySkNIiyV059uLHeCC6io-- --0MKP10WDH16bity0GoL540BZWFSZkEJQD 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/zYyUFAwAAAAAACgkQdZ/s//1SjSw8 cQf/aDbx6aW6nn0eD88C9NQYfkcFwpYj0UGOZOVQwbLRlN8I6A2WZ/4AoSmeEKIio+2EmJd9hGLn D5e5jCrKJ1qaxMSbPg0RRAAB+0HiAfcyX8UFwJmq7KKBrj0flrAH7lN0c1MVWG5J7i+96Pinm9Rw UaayclBZx6wITe/0ebKRiZ5B18g0VUUXjC3fXq6IiLiII+yIDKKMjF/y4mcN3pHuaxzLe7klsnJk LTITiywuIGgLH61zbzw3xgTw04zKaT+GCdMvNBbIp9/KKfnZHJuNxFc7rPaII09QlYZdwi5+EqjC LUNipHR6GtndX7jrh0N6oIQM+TSuNCOWgACrZyoY9w== =T1G5 -----END PGP SIGNATURE----- --0MKP10WDH16bity0GoL540BZWFSZkEJQD--