HEADS UP: FreeBSD src repo transitioning to git this weekend

[Rainer Hurling]

Am 23.12.20 um 21:55 schrieb Ulrich Spörlein:
> On Wed, 2020-12-23 at 12:19:47 -0800, John Kennedy wrote:
>> On Mon, Dec 21, 2020 at 12:47:38PM -0800, John Kennedy wrote:
>>> On Wed, Dec 16, 2020 at 05:46:35PM -0700, Warner Losh wrote:
>>> > The FreeBSD project will be moving it's source repo from subversion
>>> to git
>>> > starting this this weekend. The docs repo was moved 2 weeks ago.
>>> The ports
>>> > repo will move at the end of March, 2021 due to timing issues. ...
>>>
>>>   I filed Bug 252028 (sys/conf/newvers.sh: git "-dirty" even when
>>> clean),
>>> but that's just a trivial issue with my source tree being marked -dirty
>>> when it isn't, and that would have been part of r368709 anyway.  All my
>>> other git nits have been my own (refs/notes and origin name).
>>
>>  Warner/others, up to r368820, we had log entries that looked like this:
>>
>>     commit 3cc0c0d66a065554459bd2f9b4f80cc07426464a
>>     Author: Li-Wen Hsu <lwhsu at FreeBSD.org>
>>     Date:   Sun Dec 20 02:59:44 2020 +0000
>>     
>>         Mark the repository as being converted to Git.
>>     
>>         This is the last Subversion commit to src.
>>     
>>         Sponsored by:   The FreeBSD Foundation
>>     
>>     Notes:
>>         svn path=/head/; revision=368820
>>
>>  Now, our git logs look like this:
>>
>>     commit 17eba5e32a2cf7a217bb9f1e5dcca351f2b71cfc
>>     Author: Ed Maste <emaste at FreeBSD.org>
>>     Date:   Tue Dec 22 23:31:15 2020 -0500
>>     
>>         newvers.sh: fix sense of git dirty check
>>     
>>         Previously we reported -dirty for an unmodified tree, and no
>> -dirty if
>>         there were changes.
>>     
>>         PR:             252028
>>         Reported by:    John Kennedy
>>
>>  (Specifically, no Notes: with revision= value)
> 
> Yes, these notes are merely pointers to the SVN revisions. Without SVN,
> we will of course not get any new notes.
> 
>>  For the kernel I compiled today, the uname output dumps out:
>>
>>     FreeBSD 13.0-CURRENT #245 r368820+878d53410f75-c255274(main): ...
>>
>>  Last kernel was (-dirty since fixed):
>>
>>     FreeBSD 13.0-CURRENT #244
>> r368820+3cc0c0d66a06-c255241(main)-dirty: ...
>>
>>  So, the r368820-value isn't being updated for it to find anymore. 
>> The middle
>> value corresponds to the git commit and does have value (878d53410f75
>> is your
>> "UPDATING: Announce git transition", 3cc0c0d66a06 was the "Mark the
>> repository
>> as being converted to Git" r368820 commit).
> 
> Yeah, that's a bug in newvers.sh, thanks for pointing that out. It finds
> "some" note in the last 10k revs and then uses that, instead of properly
> falling back to counting from HEAD, which would result in -c255126 or
> something around that.

I built HEAD this afternoon and got 'FreeBSD 13.0-CURRENT #0
92be2847e84-c255272(main): Wed Dec 23 17:39:31 CET 2020'. The counting
seems more correct here?

> We'll fix it ...
> 
> Cheers
> Uli