Date: Mon, 4 Jan 2021 10:30:28 -0800 From: Enji Cooper <yaneurabeya@gmail.com> To: Warner Losh <imp@bsdimp.com> Cc: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>, FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> In-Reply-To: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com>
index | next in thread | previous in thread | raw e-mail
> On Jan 4, 2021, at 10:19, Warner Losh <imp@bsdimp.com> wrote: > > On 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 number >>> 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 working >> than >>> etcupdate. >>> >> >> 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. >> > > mergemaster has been on its way out since well before the switch to git. > 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. Adding to this: it has no maintainer, it’s less featureful, and it lacks tests. Once I switched to etcupdate a few years back I never looked back at mergemaster. I honestly think it should be deprecated in 13.x and removed in 14.x. It’s been several major releases since it’s been unofficially deprecated. -Enjihelp
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?0F14842F-2C85-4ED3-B4C9-D2AA12A55464>