From owner-freebsd-current@freebsd.org Mon Jan 4 16:36:07 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 0B5244DBE86; Mon, 4 Jan 2021 16:36:07 +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 4D8h8Q5hxWz3Gsb; Mon, 4 Jan 2021 16:36:06 +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 104Ga1dN033144 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NO); Mon, 4 Jan 2021 17:36:02 +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: Warner Losh Cc: FreeBSD Current , FreeBSD CURRENT References: <20210104123512.0f5e1b01@hermann.fritz.box> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> From: Marek Zarychta Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> Date: Mon, 4 Jan 2021 17:36:00 +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: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="JmsxH9BafeuesytbTDWtNwL1FkQ09JHft" X-Rspamd-Queue-Id: 4D8h8Q5hxWz3Gsb 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 16:36:07 -0000 This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --JmsxH9BafeuesytbTDWtNwL1FkQ09JHft Content-Type: multipart/mixed; boundary="TNLGUHpgf7dKOmCfkeYDZF88aceVGITVZ"; protected-headers="v1" From: Marek Zarychta To: Warner Losh Cc: FreeBSD Current , FreeBSD CURRENT Message-ID: <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? References: <20210104123512.0f5e1b01@hermann.fritz.box> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> In-Reply-To: --TNLGUHpgf7dKOmCfkeYDZF88aceVGITVZ Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: quoted-printable W dniu 04.01.2021 o=C2=A017:14, Warner Losh pisze: > etcupdate does a full three merge, while mergemaster fakes it in a numb= er > of ways. etcupdate directly keeps track of the resolutions, which is wh= y > $FreeBSD$ doesn't matter so much to it. >=20 > mergemaster is deprecated and will likely be removed from the system > because it has no maintainer and is quite a bit harder to keep working = than > etcupdate. >=20 Please don't sacrifice mergemaster(8) for the successful transition to Git. The amount of feedback on the mailing list should give the core@ some idea of how widely mergemasted is still deployed. Some people just like to merge files side by side with pressing keys. Why innocent mergemaster(8) has to be a victim of switching to Git? Sacrifice please svnlite(1) - it became completely useless for HEAD and upcoming stable branches. Kind regards, --=20 Marek Zarychta --TNLGUHpgf7dKOmCfkeYDZF88aceVGITVZ-- --JmsxH9BafeuesytbTDWtNwL1FkQ09JHft 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/zQ/EFAwAAAAAACgkQdZ/s//1SjSy1 pgf/UfcQGrp5f7j0GWpVARgk4yD9YfbPdhLW6NwU6kxxmKUMGbAoJMaHw3ja2n4p37VKQePO0iSf qacPZzcLQo/a9bEKGovYiC4hAiT/eUeSCkDkqGBS27+3w7nuatimuUlR8OnB/FPhp9n5iTLiMiLN 5oNaNWvZkEG5jVxRPaazBcVadePBDnH1nIEwBdXVhy8kmlzRKD4M0LfG3psfoM6DgnSlAGBRbTO8 ZRukJVoQjupfqTU3DiCkdrX51ufzjSNBtpg4uIuJN+zIO92kl+4TH3BaoKW6Ex2hkgXebv2bGuRr 5hxPkkTLkkibky5A8reypRe6lSYjRsjbzzvNiDbrXg== =+ls4 -----END PGP SIGNATURE----- --JmsxH9BafeuesytbTDWtNwL1FkQ09JHft--