From owner-freebsd-current@freebsd.org Wed Dec 23 21:12:27 2020 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 9CD7C4CBBCA; Wed, 23 Dec 2020 21:12:27 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from gmailer.gwdg.de (gmailer.gwdg.de [134.76.11.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D1Qrp598Tz4V7n; Wed, 23 Dec 2020 21:12:26 +0000 (UTC) (envelope-from rhurlin@gwdg.de) Received: from excmbx-03.um.gwdg.de ([134.76.9.218] helo=email.gwdg.de) by mailer.gwdg.de with esmtp (GWDG Mailer) (envelope-from ) id 1ksBQm-0001vK-Jq; Wed, 23 Dec 2020 22:12:24 +0100 Received: from krabat.raven.hur (10.250.9.200) by EXCMBX-03.um.gwdg.de (134.76.9.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2044.4; Wed, 23 Dec 2020 22:12:24 +0100 Subject: Re: HEADS UP: FreeBSD src repo transitioning to git this weekend To: =?UTF-8?Q?Ulrich_Sp=c3=b6rlein?= References: CC: John Kennedy , FreeBSD Current , FreeBSD-STABLE Mailing List Reply-To: From: Rainer Hurling Message-ID: Date: Wed, 23 Dec 2020 22:12:19 +0100 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="utf-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-Originating-IP: [10.250.9.200] X-ClientProxiedBy: excmbx-25.um.gwdg.de (134.76.9.235) To EXCMBX-03.um.gwdg.de (134.76.9.218) X-Virus-Scanned: (clean) by clamav X-Rspamd-Queue-Id: 4D1Qrp598Tz4V7n X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; HAS_REPLYTO(0.00)[rhurlin@FreeBSD.org]; ARC_NA(0.00)[]; HAS_XOIP(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; FREEFALL_USER(0.00)[rhurlin]; MID_RHS_MATCH_FROM(0.00)[]; MIME_GOOD(-0.10)[text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; DMARC_NA(0.00)[gwdg.de]; R_SPF_ALLOW(-0.20)[+ip4:134.76.10.0/23]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; RCVD_IN_DNSWL_MED(-0.20)[134.76.11.17:from]; NEURAL_HAM_SHORT(-1.00)[-0.999]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:680, ipnet:134.76.0.0/16, country:DE]; RCVD_TLS_LAST(0.00)[]; MAILMAN_DEST(0.00)[freebsd-stable,freebsd-current]; RWL_MAILSPIKE_POSSIBLE(0.00)[134.76.11.17:from] 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, 23 Dec 2020 21:12:27 -0000 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 >>     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 >>     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