From owner-freebsd-stable@freebsd.org Fri Feb 19 00:03:42 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 5DBAA52FC51 for ; Fri, 19 Feb 2021 00:03:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 4DhWy61zK1z4YLy for ; Fri, 19 Feb 2021 00:03:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72b.google.com with SMTP id r77so3997999qka.12 for ; Thu, 18 Feb 2021 16:03:42 -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=vCmEX3/FJimn3utv3vqLB7JOZRg/H5gTsP85KY3VMYg=; b=xEQmjuVtnH5TzgTVuTfRbIt7UvkE3IfcovGXyAxwSXG8Ise8mbmwEZVWOTud5qdmlv R3VXQ03kCzr6Kd/XN77bIAgd5l/lPlk8zVqYJpplv88k5p6lEBuckZm/bR2ZGXLBlpFK lVTZnNwl9tXptM43vB8t+H6WlYrbRvcuZxu/ZasRvGFtWgFl37lYLvhaN5v0MGuw4l1g 9pdPXAXSj52eYDOUpEYZGbiAqvMMykFnpVjuznP/IBYi0b2obYCs8ibG2i4CrJ9ViL73 lNePgoT/wSNOev6cOTtruqXb1CDuYWjIqEct4mOLbn6yt/G+3Kf/c2KxXNyRKwxQLJL+ inHQ== 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=vCmEX3/FJimn3utv3vqLB7JOZRg/H5gTsP85KY3VMYg=; b=r2ohEUYybnQE5KRegSRTcG5OY528GJ8AVVRkExZAvsyjn06JsEQ5w7bvQbdfLC5qVP RcZ8wpDYoCObrM+dLHAj3wQRhDQ39yA70DYbdJX8//6ao9xHPdGSyIrbXOzxYlKHvXom 2qRiPd44qOmSwWWfcaxmOLk2nMfZcWdCMp8hnokmukPoaCk2K+x4YSxlPvtzcH93vPyG uqr3c6ryd+Fas3ax5H5DrTHSKw59ZtOO1Q7cFeTAyhMnv2ClqP0wgF/o9puwqkffSMIa ZTqrzMMbERgsJnU5d9QRL5QStRu8w426Q/NM50WTFyw0k8YkhFmNj+EA4ZEoq3m+0eHD hgcw== X-Gm-Message-State: AOAM5312PFs2RTxIax9c4izIA6ctPYh29x82zZKHKv/IUMcRX4bJ8WZY qpKgGiGsrMIC+Zx8cMW4dPrp0WgC1xukt63Tog6aUCYkRLV8ew== X-Google-Smtp-Source: ABdhPJwm55C0aB5AYEqWyqrCM/U1JpVnX6XeJcAvs31WWe+ZLfuVjHb17OEM7vHOQ7k/DRNo4u41Rw4vfH1QW+r0tro= X-Received: by 2002:a05:620a:12d1:: with SMTP id e17mr6899203qkl.89.1613693021419; Thu, 18 Feb 2021 16:03:41 -0800 (PST) MIME-Version: 1.0 References: <5b6e1fd1-1aa6-9031-78df-9dab1f05b21a@sentex.net> <2e162938-a5e1-bf0e-8cbd-acf24a5f121d@sentex.net> In-Reply-To: <2e162938-a5e1-bf0e-8cbd-acf24a5f121d@sentex.net> From: Warner Losh Date: Thu, 18 Feb 2021 17:03:30 -0700 Message-ID: Subject: Re: stable/12 git -> svn mirror delayed To: mike tancsa Cc: Ed Maste , freebsd-stable stable , freebsd-git X-Rspamd-Queue-Id: 4DhWy61zK1z4YLy X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] 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: Fri, 19 Feb 2021 00:03:42 -0000 I've done a dry-run that looks good (at first blush, I still need to look at it in more detail). I've put a workaround into the conversion script that will fix this issue (and any others that are just like it that slip through), but is definitely hackish and not generic for all possible ways that a merge commit could land. When I'm satisfied, I'll have the automated mirroring re-enabled and we should be good, though it may be a few hours due to time zones, etc. Warner On Thu, Feb 18, 2021 at 4:40 PM mike tancsa wrote: > 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.) > > >