Date: Mon, 4 Jan 2021 11:18:31 -0700 From: Warner Losh <imp@bsdimp.com> To: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl> Cc: FreeBSD Current <current@freebsd.org>, FreeBSD CURRENT <freebsd-current@freebsd.org> Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> In-Reply-To: <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl> 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> <9d10b86a-9ef6-a9cd-786c-5eeb33ececbd@plan-b.pwste.edu.pl>
next in thread | previous in thread | raw e-mail | index | archive | help
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. Warner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ>