Date: Mon, 4 Jan 2021 11:25:53 -0800 From: Enji Cooper <yaneurabeya@gmail.com> To: Steve Kargl <sgk@troutmask.apl.washington.edu> Cc: Warner Losh <imp@bsdimp.com>, 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: <3101A583-D3BF-452B-BBAC-389EB344CD7D@gmail.com> In-Reply-To: <20210104185914.GA19556@troutmask.apl.washington.edu> References: <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu>
next in thread | previous in thread | raw e-mail | index | archive | help
> On Jan 4, 2021, at 10:59 AM, Steve Kargl = <sgk@troutmask.apl.washington.edu> wrote: >=20 > On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote: >>=20 >>> On Jan 4, 2021, at 10:19, Warner Losh <imp@bsdimp.com> wrote: >>>=20 >>> 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. >>=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 looked back at mergemaster. >>=20 >> I honestly think it should be deprecated in 13.x and removed in 14.x. = It=E2=80=99s been several major releases since it=E2=80=99s been = unofficially deprecated. >=20 > For something that has been disfavored for a decade, unmaintained > for at least 5 years, and now seemly unofficially deprecated, it > seems strange that /usr/src/UPDATING does not mention etcupdate > in the COMMON ITEMS section. >=20 > % svn info UPDATING | grep -i vision > Revision: 367909 > % svn blame UPDATING > ... > 64477 imp To rebuild everything and install it on the current = system. > 64477 imp = ----------------------------------------------------------- > ... > 262619 jmg mergemaster -Fp [5] > 262619 jmg mergemaster -Fi [4] >=20 > % svn log -r 262619 > = ------------------------------------------------------------------------ > r262619 | jmg | 2014-02-28 11:51:47 -0800 (Fri, 28 Feb 2014) | 3 lines >=20 > since -F is safe, and an update from 10-HEAD to 10-STABLE is sooo = bloody > anoying w/o it.. recommend people use -F too... > = ------------------------------------------------------------------------ >=20 > etcupdate first appeared in the tree on 2012-07-13 (r238423) As noted elsewhere in the thread: I=E2=80=99m working on it. = Here=E2=80=99s an official bug for tracking the work (in base): = https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D252417 = <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D252417>; . I=E2=80=99l= l fill it in some more throughout the day (need to context switch back = to $dayjob). Thanks :)! -Enji
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?3101A583-D3BF-452B-BBAC-389EB344CD7D>