From owner-freebsd-current@freebsd.org Wed Jan 6 11:24:25 2021 Return-Path: Delivered-To: freebsd-current@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A367C4CCC3C for ; Wed, 6 Jan 2021 11:24:25 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9n7s1kXFz3N3g for ; Wed, 6 Jan 2021 11:24:24 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.nyi.internal (Postfix) with ESMTP id D6C105C01AF for ; Wed, 6 Jan 2021 06:24:24 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute5.internal (MEProxy); Wed, 06 Jan 2021 06:24:24 -0500 X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrvdefledgvdelucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesghdtre ertddtvdenucfhrhhomhepthgvtghhqdhlihhsthhsuceothgvtghhqdhlihhsthhsseii hiigshhtrdhnvghtqeenucggtffrrghtthgvrhhnpeettddtudeugfeggefhkeekteekje elfeffleehjeffgffftdeffedtjeegueeiffenucffohhmrghinhepfhhrvggvsghsugdr ohhrghenucfkphepkedvrdejtddrledurddutddunecuvehluhhsthgvrhfuihiivgeptd enucfrrghrrghmpehmrghilhhfrhhomhepthgvtghhqdhlihhsthhsseiihiigshhtrdhn vght X-ME-Proxy: Received: from bastion.zyxst.net (fws.zyxst.net [82.70.91.101]) by mail.messagingengine.com (Postfix) with ESMTPA id 3DEF0240057 for ; Wed, 6 Jan 2021 06:24:24 -0500 (EST) Date: Wed, 6 Jan 2021 11:24:22 +0000 From: tech-lists To: freebsd-current@freebsd.org Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: Mail-Followup-To: freebsd-current@freebsd.org References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3JDsYFNURF8fZKeG" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4D9n7s1kXFz3N3g X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.27:from]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.27]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[zyxst.net:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; SUBJECT_ENDS_QUESTION(1.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.27:from]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.27:from]; RCVD_TLS_LAST(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[zyxst.net:s=fm1,messagingengine.com:s=fm1]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; DMARC_NA(0.00)[zyxst.net]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[66.111.4.27:from:127.0.2.255]; MAILMAN_DEST(0.00)[freebsd-current] X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Jan 2021 11:24:25 -0000 --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--