Date: Wed, 4 Mar 2020 03:33:02 -0500 From: Ed Maste <emaste@freebsd.org> To: freebsd-git@freebsd.org Subject: Re: Another svn-git oddity Message-ID: <CAPyFy2DvaR5S6Vaz5JYKqyqGdPCaRg5Kyyn9aDb1EyXBqnA_Ug@mail.gmail.com> In-Reply-To: <CAPyFy2A8Q=N%2BSS8=wOsfBtZ49QTUVXF2ZRYvUZX2dk=KyhKH-g@mail.gmail.com> References: <CAPyFy2A8Q=N%2BSS8=wOsfBtZ49QTUVXF2ZRYvUZX2dk=KyhKH-g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Fri, 22 Nov 2019 at 08:52, Ed Maste <emaste@freebsd.org> wrote: > > As mentioned before there are some oddities in our git history - svn > commits translated to git in a slightly strange way. These have been > addressed and if/when we run the conversion from the beginning they'll > disappear. > > I've just found another oddity that affected attempts to use git > subtree for prototyping a method of handling vendor code in our tree. > I'm not sure yet if the changes to the converter would address this > case or not. > > The affected commits: > svn git Headline > r300828 00d578928e Create branch for bhyve graphics import. > r300829 b1cfc58d46 Initial bhyve native graphics support. > r302332 6775e12557 Import bhyve_graphics into CURRENT. Thanks to all who These commits still exist in uqs's latest prototype conversion, with hashes: 953b4a972bec 8efdfe5ee821 6d7144acee3e So they cause the same issues for git subtree; we need the Tom Clarkson patch set to make this work. I will try to see if we can do an initial bootstrapping with patched git subtree and do subsequent updates with upstream git - that would at least eliminate the urgency.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2DvaR5S6Vaz5JYKqyqGdPCaRg5Kyyn9aDb1EyXBqnA_Ug>