From owner-freebsd-stable@freebsd.org Thu Feb 18 23:40:27 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 F1AC352E708; Thu, 18 Feb 2021 23:40:27 +0000 (UTC) (envelope-from mike@sentex.net) Received: from pyroxene2a.sentex.ca (pyroxene19.sentex.ca [IPv6:2607:f3e0:0:3::19]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "pyroxene.sentex.ca", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DhWRH6DkPz4W31; Thu, 18 Feb 2021 23:40:27 +0000 (UTC) (envelope-from mike@sentex.net) Received: from [IPv6:2607:f3e0:0:4:54d3:fc57:f2db:7232] ([IPv6:2607:f3e0:0:4:54d3:fc57:f2db:7232]) by pyroxene2a.sentex.ca (8.15.2/8.15.2) with ESMTPS id 11INeQ1L072249 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NO); Thu, 18 Feb 2021 18:40:26 -0500 (EST) (envelope-from mike@sentex.net) Subject: Re: stable/12 git -> svn mirror delayed To: Warner Losh , Ed Maste Cc: freebsd-stable stable , freebsd-git References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> From: mike tancsa Message-ID: <2e162938-a5e1-bf0e-8cbd-acf24a5f121d@sentex.net> Date: Thu, 18 Feb 2021 18:40:26 -0500 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.7.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Content-Language: en-US X-Rspamd-Queue-Id: 4DhWRH6DkPz4W31 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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 23:40:28 -0000 Thanks guys for the explanation / looking into it!   And thank you very much for all your efforts on this big move to git!      ---Mike On 2/18/2021 3:45 PM, Warner Losh wrote: > 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.) >