From owner-freebsd-current@freebsd.org Sun Jan 24 02:36:32 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 218404E77FC for ; Sun, 24 Jan 2021 02:36:32 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (phouka1.phouka.net [107.170.196.116]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "phouka.net", Issuer "Go Daddy Secure Certificate Authority - G2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNcZQ246Zz3nlG for ; Sun, 24 Jan 2021 02:36:30 +0000 (UTC) (envelope-from warlock@phouka1.phouka.net) Received: from phouka1.phouka.net (localhost [127.0.0.1]) by phouka1.phouka.net (8.16.1/8.16.1) with ESMTPS id 10O2ZCrx000982 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 23 Jan 2021 18:35:12 -0800 (PST) (envelope-from warlock@phouka1.phouka.net) Received: (from warlock@localhost) by phouka1.phouka.net (8.16.1/8.16.1/Submit) id 10O2ZCdI000981; Sat, 23 Jan 2021 18:35:12 -0800 (PST) (envelope-from warlock) Date: Sat, 23 Jan 2021 18:35:12 -0800 From: John Kennedy To: "Russell L. Carter" Cc: freebsd-current@freebsd.org Subject: Re: Which branch in git is 13.0-current? Message-ID: References: <86h7n7a9jx.fsf@gmail.com> <000001d6f1a8$dcd03280$96709780$@gmail.com> <86ft2ra80q.fsf@gmail.com> <004101d6f1ac$62a619d0$27f24d70$@gmail.com> <2a44aadc-7588-5bee-ac95-38b6b26f5ba4@pinyon.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2a44aadc-7588-5bee-ac95-38b6b26f5ba4@pinyon.org> X-Rspamd-Queue-Id: 4DNcZQ246Zz3nlG X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of warlock@phouka1.phouka.net has no SPF policy when checking 107.170.196.116) smtp.mailfrom=warlock@phouka1.phouka.net X-Spamd-Result: default: False [-0.80 / 15.00]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-current]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[phouka.net]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.170.196.116:from]; AUTH_NA(1.00)[]; SPAMHAUS_ZRD(0.00)[107.170.196.116:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[warlock@phouka.net,warlock@phouka1.phouka.net]; SUBJECT_ENDS_QUESTION(1.00)[]; R_DKIM_NA(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; MIME_TRACE(0.00)[0:+]; FROM_NEQ_ENVFROM(0.00)[warlock@phouka.net,warlock@phouka1.phouka.net]; ASN(0.00)[asn:14061, ipnet:107.170.192.0/18, country:US] 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: Sun, 24 Jan 2021 02:36:32 -0000 On Sat, Jan 23, 2021 at 06:34:58PM -0700, Russell L. Carter wrote: > So has anyone tracking stable/12 and ports successfully completed the > git checkout stable/13; make buildworld; make installworld; mergemaster > drill? I see I can checkout stable/13. > > Do make.conf | src.conf | GENERIC have silent breaking changes? > I usually, recklessly, assume no. > > Ima throw the build->install as soon as the drill looks good. I've done it about 3x now, from different stages of 12.2. Don't have any kernel modules from ports loaded, usually end up doing the world+kernel thing twice due to some libraries going away, then rebuild all ports. I've continued to use mergemaster, but there is a thread talking about it going towards obsolete.