Another svn-git oddity

[Ed Maste]

On Tue, 26 May 2020 at 14:32, Ed Maste <emaste at freebsd.org> wrote:
>
> On Tue, 26 May 2020 at 14:20, Ed Maste <emaste at freebsd.org> wrote:
> >
> > I still see these in the latest iteration, commits
> > e3850c874e5ffc0edae1887b21cb27b642de9161
> > 08b39b4bc02e511188ff37159e33fd095c6b28ba
> > 227b908653e891cdd4a26c40eeb078e4b138d16f
> >
> > I'm looking at the converter now...
>
> I'm running the converter locally with a rule for 300828 added now.

I added to freebsd-base.rules:

match /usr/nwhitehorn/kboot/
min revision 276329
max revision 276329
end match
match /projects/bhyve_graphics
min revision 300828
max revision 300828
end match

to skip entirely these commits that established new subtree working
dirs. This addresses some of the "git subtree split" problem.

The next commit affecting subtree split is caused by r268229:
Author: marcel <marcel at FreeBSD.org>
Date:   Thu Jul 3 18:24:28 2014 +0000

    Sync with head.

Notes:
    svn path=/user/marcel/mkimg/; revision=268229

This is now recorded as a merge from head @ 268227 into Marcel's mkimg
branch. In the existing (GitHub mirror) conversion it is not a merge
(presumably just because we're not parsing mergeinfo at all there).