Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jan 2021 17:19:42 +0000
From:      Mark Linimon <linimon@lonesome.com>
To:        freebsd-current@freebsd.org
Cc:        Mark Linimon <linimon@lonesome.com>
Subject:   Re: CURRENT, usr/src on git, howto "mergemaster"?
Message-ID:  <20210106171942.GB9919@lonesome.com>
In-Reply-To: <X/Wd5uVl0/oNVCbS@bastion.zyxst.net>
References:  <CANCZdfqPzjUt9Vcw2DsoM0470CcbWe0z15RcMBczJeQpJqF6EQ@mail.gmail.com> <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu> <b255fc6b-f5f7-fc91-5594-ad67bb98fd9d@freebsd.org> <X/Wd5uVl0/oNVCbS@bastion.zyxst.net>

next in thread | previous in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20210106171942.GB9919>