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

Mark Linimon linimon at lonesome.com
Wed Jan 6 17:19:45 UTC 2021


On Wed, Jan 06, 2021 at 11:24:22AM +0000, tech-lists wrote:
> >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
> 
> Really +1 to this, times a thousand. Especially the 2nd point which
> I think I'd be right in thinking is the source of truth? It also talks
> extensively about svn and yet 12-stable has been on git for a month
> nearly, and the svn repo has not been updated since.

It's _a_ source of truth but it, like everything else, is maintained by
volunteers.

The only _real_ source of truth is the commits.

mcl


More information about the freebsd-current mailing list