Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 6 Jan 2021 11:24:22 +0000
From:      tech-lists <tech-lists@zyxst.net>
To:        freebsd-current@freebsd.org
Subject:   Re: CURRENT, usr/src on git, howto "mergemaster"?
Message-ID:  <X/Wd5uVl0/oNVCbS@bastion.zyxst.net>
In-Reply-To: <b255fc6b-f5f7-fc91-5594-ad67bb98fd9d@freebsd.org>
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>

next in thread | previous in thread | raw e-mail | index | archive | help

--3JDsYFNURF8fZKeG
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Mon, Jan 04, 2021 at 08:47:28PM +0100, Michal Meloun 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=
=20
about svn and yet 12-stable has been on git for a month nearly, and the svn=
=20
repo has not been updated since. Not even a hint suggesting the new process=
,=20
that the indicated process is depreciated, or a link to the newer=20
process/workflow.

--=20
J.

--3JDsYFNURF8fZKeG
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAl/1nd0ACgkQs8o7QhFz
NAWu8BAAjBWZBJ2GDK1TtxrUmTdX/7BfGuynzh4JGMyS/DPaingCjIXxLKt7Qbb4
61Ky3J1065l0eEUkgWzUCWKUH7xYRYKy4vdVDk6yyepvm9XzA8bXV9ntLiPgwoFZ
AbCmpR6D6yopVVj3pE9Cs0YUIhPaGkojLWoYRIq563qXmRz5OEfM4oN+56k1Ia8l
P8IF2tJ7xqOVj/6iIfkgM/jJ4f0yu1fB4buskUZrmRzxtwPKJDZx84TcuMENCJw2
hKN/LmYR6X0uWdI9sEi9pli5YwgOjb6qIP5c9q1bCaJfSI2aThzyrhGzb96Xpido
VRl7ZNsI/7lO8GB0CZMiUlAbc5yE2k5mohQOYzPisFFvfBC2KCINtCNnTmcB3T6x
CEkemEA6CKMhIDP/qFZMAzEqW07TyjVkP6Ts/W/K48VL0PILjUijbUn2KOEw0S/v
kLa1g1tSRCbldT6XXc9l0pzMgdurI0h7EJlILsdJWUrkP3CYs1viJAaGfUJC44Bg
5RIw/qlbkr8gX6VC1xeL9ofR/YZIp7eBKiaV/SpmqgSwDsmUlCQaqn4Vxgu3ov4i
EutSde1669YGprVADndws+1Kb65rZU0WtUCHy1RFPmfoAbG9d8+WgXHLTJAu3q+Z
KEhjhe8GFN1PBOL2Tr3eHTkfZf/va+SN7IRWdGTOHL4fwfeMUtA=
=YJVI
-----END PGP SIGNATURE-----

--3JDsYFNURF8fZKeG--



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