From owner-freebsd-current@freebsd.org Sun Jan 24 01:35:07 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 284984E5880 for ; Sun, 24 Jan 2021 01:35:07 +0000 (UTC) (envelope-from rcarter@pinyon.org) Received: from h2.pinyon.org (h2.pinyon.org [65.101.20.170]) (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 did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4DNbCZ2R5yz3kdM for ; Sun, 24 Jan 2021 01:35:06 +0000 (UTC) (envelope-from rcarter@pinyon.org) Received: from [10.0.10.15] (unknown [10.0.10.15]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by h2.pinyon.org (Postfix) with ESMTPSA id EC03ECD1D for ; Sat, 23 Jan 2021 18:34:58 -0700 (MST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pinyon.org; s=dkim; t=1611452098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uHd77Y0uHA8ZwJzj9nU8j/EZ5mOfqI4jb5gyd+VY21Y=; b=ESZkAy4f1HHTX929RWh0jHTzyVAwBC61zs2B/G7fxR6/X3egidTAu88IqzlkNP1u33ijnK K40aLCFtCLuI+nP9CvJUUzEZi5OVMbN762Wojqp7acDRiTSI3PrZgBDwLtUH3Ohypw+jFf BWQluGtTcLvy7bLXtaadioPTMvebY/E= Subject: Re: Which branch in git is 13.0-current? To: freebsd-current@freebsd.org References: <86h7n7a9jx.fsf@gmail.com> <000001d6f1a8$dcd03280$96709780$@gmail.com> <86ft2ra80q.fsf@gmail.com> <004101d6f1ac$62a619d0$27f24d70$@gmail.com> From: "Russell L. Carter" Message-ID: <2a44aadc-7588-5bee-ac95-38b6b26f5ba4@pinyon.org> Date: Sat, 23 Jan 2021 18:34:58 -0700 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Firefox/78.0 Thunderbird/78.6.1 MIME-Version: 1.0 In-Reply-To: <004101d6f1ac$62a619d0$27f24d70$@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-2.10 X-Rspamd-Server: h2 X-Rspamd-Queue-Id: 4DNbCZ2R5yz3kdM X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=pinyon.org header.s=dkim header.b=ESZkAy4f; dmarc=none; spf=pass (mx1.freebsd.org: domain of rcarter@pinyon.org designates 65.101.20.170 as permitted sender) smtp.mailfrom=rcarter@pinyon.org X-Spamd-Result: default: False [-2.50 / 15.00]; RCVD_TLS_ALL(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; R_DKIM_ALLOW(-0.20)[pinyon.org:s=dkim]; MID_RHS_MATCH_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[65.101.20.170:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+mx]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-current@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[65.101.20.170:from:127.0.2.255]; ARC_NA(0.00)[]; DKIM_TRACE(0.00)[pinyon.org:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; DMARC_NA(0.00)[pinyon.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; SUBJECT_ENDS_QUESTION(1.00)[]; ASN(0.00)[asn:209, ipnet:65.101.0.0/18, country:US]; RCVD_COUNT_TWO(0.00)[2]; 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: Sun, 24 Jan 2021 01:35:07 -0000 On 1/23/21 10:22 AM, driesm.michiels@gmail.com wrote: > >>>> -----Original Message----- >>>> From: owner-freebsd-current@freebsd.org >>> current@freebsd.org> On Behalf Of Malcolm Matalka >>>> Sent: Saturday, 23 January 2021 17:43 >>>> To: FreeBSD Current >>>> Subject: Which branch in git is 13.0-current? >>>> >>>> I upgraded my src checkout to git, and looks like I'm on 14.0-CURRENT? >>>> >>>> >>>> FreeBSD bsdell 14.0-CURRENT FreeBSD 14.0-CURRENT #33 >>>> main-c256217-g6c789c55c4ba: Sat Jan 23 16:08:16 CET 2021 >>>> root@bsdell:/usr/obj/usr/src/amd64.amd64/sys/GENERIC amd64 >>>> >>>> I am in the main branch, which I got by following the docs on >>> transitioning to >>>> git. >>>> >>>> The main issue is I can't use pkg now. >>> >>> Build pkg from ports or wait a bit till the clusters have caught up >>> building the packages with the base version change. >> >> Does that mean CURRENT is now 14.0? I must have missed the >> announcement. > > That is correct, 13-stable has been branched from 13-current which has now > been bumped to 14-current. > Because it's a major version change going from 13 to 14, pkg is a bit > agitated regarding the ABI. 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. Russell >>> >>> Dries >>> >>> >>>> >>>> Thanks! >>>> _______________________________________________ >>>> freebsd-current@freebsd.org mailing list >>>> https://lists.freebsd.org/mailman/listinfo/freebsd-current >>>> To unsubscribe, send any mail to "freebsd-current- >> unsubscribe@freebsd.org" > > > _______________________________________________ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscribe@freebsd.org" >