Date: Wed, 17 Jun 2020 09:36:21 -0400 From: Ed Maste <emaste@freebsd.org> To: freebsd-git@freebsd.org Subject: Re: Next odd commit affecting `git subtree split` experiments with contrib/elftoolchain Message-ID: <CAPyFy2BW_SHeuO_xv=eZCOPDb8h7zg4ko%2ByS0kWTh%2B9QfZrG-A@mail.gmail.com> In-Reply-To: <CAPyFy2BLM4=n4gbmfy19Vbo4c7c1JUYhB6MDTsJeU%2BLMEsfEmw@mail.gmail.com> References: <CAPyFy2DR6R4S7kgkRtrWzPBuD_6QR=A_hU=sP%2BLm==Y61AKhsA@mail.gmail.com> <CAPyFy2BLM4=n4gbmfy19Vbo4c7c1JUYhB6MDTsJeU%2BLMEsfEmw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 16 Jun 2020 at 22:25, Ed Maste <emaste@freebsd.org> wrote: > > I've now successfully used Tom Clarkson's patched git subtree[1] to > split elftoolchain out of cgit-beta, keeping the vendor branch history > intact, and avoiding the extraneous and bogus commits. I've done a cursory comparison of the history in this converted + split repo against contrib/elftoolchain in svn, and it is broadly as expected. There are some commits that are shown only in the git conversion, and some that appear only in svn. The git history includes the vendor branch commits, which do not appear in svn log of the subdirectory. `git log --graph` makes the relationship between the various branches clear. Subversion history includes a number of commits that affect mergeinfo only, such as r353358[1]. These are completely absent in the git conversion. As expected, the contents of the files in the git conversion and of contrib/elftoolchain are identical. [1] https://svnweb.freebsd.org/base?limit_changes=0&view=revision&revision=353358
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BW_SHeuO_xv=eZCOPDb8h7zg4ko%2ByS0kWTh%2B9QfZrG-A>