From owner-freebsd-stable@freebsd.org Thu Feb 18 20:45:26 2021 Return-Path: Delivered-To: freebsd-stable@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 8A2C854DD35 for ; Thu, 18 Feb 2021 20:45:26 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DhRYK4vBvz3kVQ for ; Thu, 18 Feb 2021 20:45:25 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2c.google.com with SMTP id s10so982740qvl.9 for ; Thu, 18 Feb 2021 12:45:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=YGUP3S9UHiYcyIRfVbsnITPxJj91y2EVs4nI9w+ipyE=; b=YecM1XExvBILgCfdVf8OTVo5JaFcTglMmJdz7sstvw+ETJ2wthrzKpHPbVGQe8C+gs 22PMeHaGvlJlkjWcIiVi2obUluzIxdWM235QrPpzGqhgbwjJlhgx+EcBeVkPX1X7Fq/F t/Ryy1wASphfEYVE2NZB/NR/7F01XAvaZyjtGwNOevp0H118VdsHy2U5ykhmDcQX8jNW aJl1aE2WVjfBufl+Y9rilBMb/jXsAyoXLnLWxDf8qhCp7/FNNqBXTa20MZRIH7h8uVLC ihLn1+8/QXgQ24E34gI/O/ZaTGVKpNiUv5k9JAV9gf8xikp7aXOeyhluBBKySkoETtma Abyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=YGUP3S9UHiYcyIRfVbsnITPxJj91y2EVs4nI9w+ipyE=; b=D4JgYHaf2se8TIm+xJ8cgUXc1iMWPjjrqUzdj/fqFBFviQbIAXAFIGGE4AHyy03PtF tX1mZ2NZ2gH3j8yO6c1ORChvK/WcYHROs9SmQYwl/dyDs/xp7kGFuEXA3jasMjinu2kP G2++bfWWcIf6a9gdkpe0wXdMVcqKh5t04wnnPzfyld/2GQ6D7DlJ6Kh67aSIjErsODCB +faSbcuFj+j8dVyVl1RuWHvXnUzs811AbHsO2CTE8hmLO4CWnC+3IYUah7bZt6XUsxww n5uumcok5tYxj73BAQCAp2L6BKe8AEfpJvVVESVvAy0QaSJRU9MHOzghhwQsUsdgdO8k sNDQ== X-Gm-Message-State: AOAM531QxHSYHKem9djwq7ci6GL7nFyZhwBcktnzRy6xiuFG1+IEC3nB EJYNhNrFlNWM0Ej2Aph4j4FPMrV9JknoArbSyuLZMA== X-Google-Smtp-Source: ABdhPJwJ//QZebBTY5ozd0QcL5ZQeKgUIIef4oC/9iqAd0vPye8y/cYRFVLK4UjDMoCoM811TX2QNyJsL5YKifABFMs= X-Received: by 2002:a0c:abce:: with SMTP id k14mr5874979qvb.23.1613681124544; Thu, 18 Feb 2021 12:45:24 -0800 (PST) MIME-Version: 1.0 References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> In-Reply-To: From: Warner Losh Date: Thu, 18 Feb 2021 13:45:13 -0700 Message-ID: Subject: Re: stable/12 git -> svn mirror delayed To: Ed Maste Cc: freebsd-stable stable , freebsd-git , mike tancsa X-Rspamd-Queue-Id: 4DhRYK4vBvz3kVQ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=YecM1XEx; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-stable@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2c: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:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2c:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-stable]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 18 Feb 2021 20:45:26 -0000 The problem is that it was a merge commit, which should have been administratively prohibited. A merge commit from main to stable/* is never the right thing. It creates problems, not least of which is the issue with the subversion exporter. In this case, it won't create the more severe issues like we have in the converted past, so that's at least something. I wrote the script assuming there'd never be a merge commit. I'll fix things by hand for this one commit which will get things going again. Making this exporter handle merge commits generically is tricky and beyond the scope of the work I took on... Hopefully, we'll get the commit hook problem fixed soon so it won't happen again. Warner On Thu, Feb 18, 2021 at 1:30 PM Ed Maste wrote: > The git-svn stable/12 mirror is currently stuck. It encountered an > issue with the OpenSSL 1.1.1j import (e3a8c0df593b) and hasn't been > able to make progress past it. It's under investigation and will > hopefully be resolved soon. > > (I think the git-svn converter is trying to cherry-pick each of the > vendor updates on the branch 4f55bd5321b7 rather than a single commit > for the merge itself.) >