Service disruption: git converter currently down

Ed Maste emaste at
Tue Sep 24 14:03:15 UTC 2019

On Mon, 23 Sep 2019 at 14:42, Ulrich Spörlein <uspoerlein at> wrote:
> Is there really that much value in having "git blame" work in that environment?
> My mental model is of short-lived branches that get upstreamed, so I'm biased
> towards this not being all that big of a problem (for some at least).

For FreeBSD developers working against the git mirror and committing
to SVN I agree it's not much of a concern. But we have a significant
number of downstream consumers using the git mirror with long-lived
derived branches and churn here is going to be somewhat painful.

I suspect your suggestion about merging from both broken and fixed to
the derived branch is the most usable solution for folks using a
long-lived merge workflow.

> I'm 80% sure that you can just merge both branches and things will be fine
> (though the exact incantation will surely be black magic). I'd love to
> try this on
> an actual repo though, I don't have the time to craft some test repo to verify
> this assumption, and then find out that other repos are different).

Yes, once we have some time to rerun the conversion (using new
branch/merge configuration for the stable/10 issue) we should test
this out.

More information about the freebsd-git mailing list