Re: Which branch in git is 13.0-current?

On 1/23/21 10:22 AM, driesm.michiels_at_gmail.com wrote:
> 
>>>> -----Original Message-----
>>>> From: owner-freebsd-current_at_freebsd.org <owner-freebsd-
>>>> current_at_freebsd.org> On Behalf Of Malcolm Matalka
>>>> Sent: Saturday, 23 January 2021 17:43
>>>> To: FreeBSD Current <freebsd-current_at_freebsd.org>
>>>> 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_at_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_at_freebsd.org mailing list
>>>> https://lists.freebsd.org/mailman/listinfo/freebsd-current
>>>> To unsubscribe, send any mail to "freebsd-current-
>> unsubscribe_at_freebsd.org"
> 
> 
> _______________________________________________
> freebsd-current_at_freebsd.org mailing list
> https://lists.freebsd.org/mailman/listinfo/freebsd-current
> To unsubscribe, send any mail to "freebsd-current-unsubscribe_at_freebsd.org"
>