Date: Wed, 27 May 2020 09:49:45 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: Another svn-git oddity Message-ID: <CAPyFy2AryZkQUHt6EH=GooWM_qXiCHR0Yk2YYSKDZgaK1HT7PA@mail.gmail.com> In-Reply-To: <CAPyFy2A1H3J6dn8c6oOmov_uSKV8r8Jju%2BraKyeNhFo42xVwpw@mail.gmail.com> References: <CAPyFy2A8Q=N%2BSS8=wOsfBtZ49QTUVXF2ZRYvUZX2dk=KyhKH-g@mail.gmail.com> <CAPyFy2DvaR5S6Vaz5JYKqyqGdPCaRg5Kyyn9aDb1EyXBqnA_Ug@mail.gmail.com> <CAPyFy2ApMj3pD8FwGeA5ahrcZS0JUvuBD306TDQdSstJQk9mbQ@mail.gmail.com> <CAJ9axoTo=YUwexpgGVuGWBvqL3ybanrQbrPEqpnRS1%2B31gVY-A@mail.gmail.com> <CAPyFy2CSw7vfacAz=b7yLYHeJ22Pz=XW9CWWMbbz0e%2Bv8QBe8A@mail.gmail.com> <CAPyFy2A1H3J6dn8c6oOmov_uSKV8r8Jju%2BraKyeNhFo42xVwpw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 26 May 2020 at 14:32, Ed Maste <emaste@freebsd.org> wrote:
>
> On Tue, 26 May 2020 at 14:20, Ed Maste <emaste@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@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).
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2AryZkQUHt6EH=GooWM_qXiCHR0Yk2YYSKDZgaK1HT7PA>