From nobody Thu Oct 21 23:19:00 2021 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 074CB18028BC for ; Thu, 21 Oct 2021 23:19:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ua1-x92e.google.com (mail-ua1-x92e.google.com [IPv6:2607:f8b0:4864:20::92e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Hb3Mh0p7cz3DL7 for ; Thu, 21 Oct 2021 23:19:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-ua1-x92e.google.com with SMTP id r17so4325745uaf.8 for ; Thu, 21 Oct 2021 16:19:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20210112.gappssmtp.com; s=20210112; h=mime-version:from:date:message-id:subject:to; bh=xn6A2GDlYKrqWCPgRqfUSExnUWHBuY7FjfduI18Qj40=; b=hUmNmekvTz/p1Ds+woKmuJXXnWYUoj7avTQpFXqWvX+qf/c51N6HuHvLjRMW1sFmt9 aGgYQNe5+ZoaUO00Tno8/hMqSBoflNnq+PF+qcyfDahuqAIy/oGjbnVHN5SfklpqAmk2 eRyOvtYR0B5B7riMhIjcmcTOfxrWqj/NIqBzi1dnGobZmXLxDt2CXWrMdgqO2IsIze8r VbGbjBq2tQdi8T9OfcsxPex8XsaCNXV6+y9MHakjg5c6uf2vnxHoTGt7YUmgodEkbYRC rTh9CHIob6A9DHerdu7Ll1rgUC95pWeuKdBwnb1pMktl7J0s8VRVx+lnYeYVWUVF+Jqx gKbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=xn6A2GDlYKrqWCPgRqfUSExnUWHBuY7FjfduI18Qj40=; b=TOlfSZKOLayyFseHVXxhn0bhux7D//i+wpN3fOniQEooyuNlytG+3FJSn7R1Oe15SV E3e0LXPyvs0aPCDcWLm7yQyu58+AWRpm7wjsIzjR3OYJTYa7uyMtMAEbTAyac1t+iEtM brsBMTjLOaWIEfJkqwbEFLHJAaOgSbvU4nAdGVLTC1BVXaI2FX7CcGahR3DAWnmkiHbv jfNumfhJtBDC7rvewii2YLqe08WedRQpIIE6/85QB4mQY4YvG6sVt1M74cmZTBClce4R dXWatbEADArO3iteMYUgTOOALtxYFc/j8qvZxsn5LGTECiNPd1z5GOwOU83R8ni+ddpI Buxw== X-Gm-Message-State: AOAM533L12zxuv7nS8ItgcRIQm9IvsPIkfprRCimxH534sFP6XkGWaAS j6gTcLpJUk1SA14iao9XhrXK7xBm/j4DC+IzLbb+BKO6qCeRjQ== X-Google-Smtp-Source: ABdhPJwSovvG2/LDEmju4RjUKmbC7M6q83iGENBDI1R1/BEYVkEgHjO+dIgnYiaFo0oaKgMuQGWwj0J+vIBfwKkrRsM= X-Received: by 2002:a67:d28f:: with SMTP id z15mr10300828vsi.44.1634858351240; Thu, 21 Oct 2021 16:19:11 -0700 (PDT) List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 From: Warner Losh Date: Thu, 21 Oct 2021 17:19:00 -0600 Message-ID: Subject: Subversion Mirror To: freebsd-git Content-Type: multipart/alternative; boundary="00000000000048ba6405cee51fb8" X-Rspamd-Queue-Id: 4Hb3Mh0p7cz3DL7 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20210112.gappssmtp.com header.s=20210112 header.b=hUmNmekv; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::92e) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-0.43 / 15.00]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20210112.gappssmtp.com:s=20210112]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-0.71)[-0.710]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; NEURAL_SPAM_MEDIUM(1.00)[0.995]; RCPT_COUNT_ONE(0.00)[1]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20210112.gappssmtp.com:+]; NEURAL_HAM_SHORT(-0.72)[-0.717]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::92e:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: Y --00000000000048ba6405cee51fb8 Content-Type: text/plain; charset="UTF-8" Greetings, This email documents two recent events with the git -> subversion mirror. This seems like the best way to document these two issues given their esoteric nature. We stopped mirroring stable/12 about a week ago. The root cause of this outage was traced to there being an empty commit that was merged. This caused the git cherry-pick that we do to bring these into the git-svn tree that we use to publish to subversion to fail. The code has been updated to handle these commits in the future. In the future, empty commits will simply be skipped. Kyle did these commits to record a commit/backout pair had been 'merged' so that they stopped showing up in the tools as merge candidates. Since this metadata exists only in the git world, dropping them in the subversion world is fine (we've stopped updating mergeinfo data for stable/12). The second incident was when the BETA1 builds were delayed by 23 hours. This was due to the creation of the releng/12.3 branch in git. This is our first new releng branch since we started mirroring to svn and the process was not documented by the author of the git to subversion script (namely me). It took me a while to understand why simply creating the branch was insufficient and to realize the proper path forward. The proper sequence of events is to create new releng/12.x branch from the branch point by hand in subversion. All these things should be done as user git2svn: % svn copy file:///home/svn/base/stable/12@r370949 file:///home/svn/base/releng/12.3 -m 'Create releng/12.3' where r370949 was the point in subversion where releng/12.3 was branched. Once this branch was created, the 'git-svn' pump needed to be primed. The releng123 branch needed to be added to ~git2svn/git2svn.conf file (and but not to the list of branches= yet): # releng/12.3 config releng123_name="releng/12.3" releng123_path=/home/git/freebsd-src-releng-12.3 Once that was done, we needed to initialize the git2svn tree that lives on git2svn.freebsd.org, as the user git2svn: % ./gsm2 -b releng123 branch-init which will create the necessary git-svn tree for the crontab's 'gsm2 mirror' command to work. Once the branch has been initialized, releng123 should be added to the branches= so that commits start to flow. These issues have been corrected, so the git -> svn mirror hopefully will go back to being a background process that just works. One could argue this should be automated. I've chosen not to automated it because it's a lot more effort to do that than to document the process should we have a 12.4-RELEASE in the future (and its associated releng/12.4). Finally, we're still mirroring the 11.x branches. This will stop at some point in the future, though, most likely the next time the mirroring of 11.x breaks :). Warner --00000000000048ba6405cee51fb8--