Re: CURRENT, usr/src on git, howto "mergemaster"?

From: Michal Meloun <meloun.michal_at_gmail.com>
Date: Mon, 4 Jan 2021 20:47:28 +0100
On 04.01.2021 19:59, Steve Kargl wrote:
> On Mon, Jan 04, 2021 at 10:30:28AM -0800, Enji Cooper wrote:
>>
>>> On Jan 4, 2021, at 10:19, Warner Losh <imp_at_bsdimp.com> wrote:
>>>
>>> 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.
>>
>> -Enji
>>
> 
> 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.
> 
> % 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]
> 
> % svn log -r 262619
> ------------------------------------------------------------------------
> r262619 | jmg | 2014-02-28 11:51:47 -0800 (Fri, 28 Feb 2014) | 3 lines
> 
> 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...
> ------------------------------------------------------------------------
> 
> etcupdate first appeared in the tree on 2012-07-13 (r238423)
> 

Moreover mergemaster is still officially documented and recommend as 
only right method in FreeBSD handbook. See 
https://www.freebsd.org/doc/handbook/makeworld.html.
World is moving, we may have new tools but each deprecation should be, 
in this order:
1) well announced
2) adjusted in the handbook
3) implemeted

Michal
Received on Mon Jan 04 2021 - 18:47:32 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:41:26 UTC