Date: Mon, 4 Jan 2021 19:49:09 +0100 From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: Enji Cooper <yaneurabeya@gmail.com>, 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: <32e8677d-642c-204f-f89a-53a1f3bea6f7@plan-b.pwste.edu.pl> In-Reply-To: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> References: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@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) --0MKP10WDH16bity0GoL540BZWFSZkEJQD Content-Type: multipart/mixed; boundary="IyZeTT2aC8MQUySkNIiyV059uLHeCC6io"; protected-headers="v1" From: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> To: Enji Cooper <yaneurabeya@gmail.com>, Warner Losh <imp@bsdimp.com> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Message-ID: <32e8677d-642c-204f-f89a-53a1f3bea6f7@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> 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 <imp@bsdimp.com> wrote: >> >> =EF=BB=BFOn Mon, Jan 4, 2021 at 9:36 AM Marek Zarychta <zarychtam@plan= -b.pwste.edu.pl> >> 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--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?32e8677d-642c-204f-f89a-53a1f3bea6f7>