From owner-freebsd-current@freebsd.org Wed Jan 6 17:19:45 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 A151C4D78AD for ; Wed, 6 Jan 2021 17:19:45 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from mail.soaustin.net (mail.soaustin.net [18.222.6.11]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.soaustin.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9x1r73MMz4bGy for ; Wed, 6 Jan 2021 17:19:44 +0000 (UTC) (envelope-from linimon@lonesome.com) Received: from lonesome.com (unknown [18.188.142.31]) by mail.soaustin.net (Postfix) with ESMTPSA id DBE80170FD; Wed, 6 Jan 2021 17:19:43 +0000 (UTC) Date: Wed, 6 Jan 2021 17:19:42 +0000 From: Mark Linimon To: freebsd-current@freebsd.org Cc: Mark Linimon Subject: Re: CURRENT, usr/src on git, howto "mergemaster"? Message-ID: <20210106171942.GB9919@lonesome.com> References: <0F14842F-2C85-4ED3-B4C9-D2AA12A55464@gmail.com> <20210104185914.GA19556@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) X-Rspamd-Queue-Id: 4D9x1r73MMz4bGy X-Spamd-Bar: - X-Spamd-Result: default: False [-1.20 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_LOW(-0.10)[18.222.6.11:from]; SUBJECT_ENDS_QUESTION(1.00)[]; R_DKIM_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[18.222.6.11:from]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:16509, ipnet:18.220.0.0/14, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[linimon]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[lonesome.com]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[18.222.6.11:from:127.0.2.255]; FROM_EQ_ENVFROM(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; R_SPF_NA(0.00)[no SPF record]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; 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 17:19:45 -0000 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