stable/12 git -> svn mirror delayed

[Warner Losh]

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 <emaste at freebsd.org> 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.)
>