Date: Mon, 4 Jan 2021 17:36:00 +0100 From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: Warner Losh <imp@bsdimp.com> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> In-Reply-To: <CANCZdfpGeifVQJENJ7Tk1LkMwk_NUK_U37h65rHw%2B6jtzv5Uwg@mail.gmail.com> References: <20210104123512.0f5e1b01@hermann.fritz.box> <X/MKNnDIdd/mCUNP@albert.catwhisker.org> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <CANCZdfpGeifVQJENJ7Tk1LkMwk_NUK_U37h65rHw%2B6jtzv5Uwg@mail.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) --JmsxH9BafeuesytbTDWtNwL1FkQ09JHft Content-Type: multipart/mixed; boundary="TNLGUHpgf7dKOmCfkeYDZF88aceVGITVZ"; protected-headers="v1" From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: Warner Losh <imp@bsdimp.com> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> 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> <X/MKNnDIdd/mCUNP@albert.catwhisker.org> <3137a3ce-50c8-bee5-6a15-7701e3281500@FreeBSD.org> <CANCZdfpGeifVQJENJ7Tk1LkMwk_NUK_U37h65rHw+6jtzv5Uwg@mail.gmail.com> In-Reply-To: <CANCZdfpGeifVQJENJ7Tk1LkMwk_NUK_U37h65rHw+6jtzv5Uwg@mail.gmail.com> --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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9d10b86a-9ef6-a9cd-786c-5eeb33ececbd>