Date: Thu, 25 Jul 2019 08:53:02 -0400 From: Ed Maste <emaste@freebsd.org> To: Warner Losh <imp@bsdimp.com>, freebsd-git@freebsd.org Subject: Re: github freebsd and svn freebsd Message-ID: <CAPyFy2BKe%2BfcXzcOTeLQHEhDrJeS04pQqpBd7pF0WQMtn44qfQ@mail.gmail.com> In-Reply-To: <CAPyFy2BGtxWQdHS=a0-=bWRArjSS61QZuJ7LoEUpvGQihOsjzw@mail.gmail.com> References: <18a5abcc-afbc-41c3-75ed-e33607e70c8f@zyxst.net> <20180904105302.GD2118@home.opsec.eu> <CAPyFy2AvH5p8Oh5TBfAUJ5z6jm9GdqS252rN1ETnYa=xb4-qmg@mail.gmail.com> <CANCZdfo-xfO_0NEg8Lc0zsY%2BSb6QmOwfFkRy3SV6RcnOY6jPnQ@mail.gmail.com> <CAPyFy2BGtxWQdHS=a0-=bWRArjSS61QZuJ7LoEUpvGQihOsjzw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
In response to a discussion about bogus metadata attached to some Git
commits due to (since-fixed) issues in the FreeBSD SVN mirroring
setup, and the possibility of fixing that:
On Thu, 6 Sep 2018 at 21:02, Ed Maste <emaste@freebsd.org> wrote:
>
> One way we could handle the mechanics of the migration itself is:
>
> * Create an alias for the current master branch - say, master-gen1
> * Continue running the existing conversion
> * Start running a fixed svn-git conversion which pushes to master-gen2
> * Document the process for migrating downstream work from one to the other
> * Switch master to master-gen2
> * Deprecate master-gen1 after a suitable period
Alternatively, we can just leave it as is and accept that the Git
history will forever have these quirks, and will not be easily
reproducible by third parties.
In any case I wanted to provide some information for future reference.
I believe these are all of the commits with 'svnmir' metadata:
06375ea686601e39c3d2f21e9576b0a450f22036
9c3b950c988087947d7fbe9c98e2507def26a748
3dcae3d578040f56b4160c84dff9f6c0058957ac
b57378964869e9a06b5da934bf4a7696ec950ba4
c5e8194f33abf05314599d63c1e00d01aa354f47
b6f1d41eacf4c28a5fd409b6080579ef674dcd08
fcec91b0d8c84eacea23841e9ed20ddf40b6fd1b
a5c351dbcd0eb2f90aaccbd113760526a05c3953
c5dd590220d0afe971d065bfe9324f549dd00968
f974a6368a30171712d61f5383afce1f1fe96bf1
6416b56f5a3923c6c264b46365e16718ccabf081
30185114e933b00142bfb617a492cbb266e059c5
91308aec6ca93cab82659cd43b3f6a83d366350b
9b61eb04fd675b6e65c99b0c82bddfd384880f30
e3a73b4cd52efd8645efcf07184f8eff1ff3339d
They're all on one of these dates: 20 July 2015, 4-9 Aug 2015, 14 Jan 2016
As an example c5e8194f33abf05314599d63c1e00d01aa354f47 is:
% git show --notes --pretty=raw c5e8194f33abf05314599d63c1e00d01aa354f47
commit c5e8194f33abf05314599d63c1e00d01aa354f47
tree d300551a8d33164568294340455656c11150eacc
parent abef15cd813ec731ce02f90e20feb9e29ed750e9
author svnmir <svnmir@FreeBSD.org> 1438695626 +0000
committer svnmir <svnmir@FreeBSD.org> 1438695626 +0000
Ensure the local MANIFEST is always used when verifying remote
distribution sets.
MFC after: immediately
Sponsored by: The FreeBSD Foundation
Notes:
svn path=/head/; revision=286285
We also have history from stable/10 grafted into git master -- r306097
restored a deleted file by copying a version from stable/10, and the
svn->git process brought along the entire stable/10 history with that.
We also have stable/6,7,8 history and even releng/8.1. I count 20819
stable and releng commits in "git log origin/master".
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BKe%2BfcXzcOTeLQHEhDrJeS04pQqpBd7pF0WQMtn44qfQ>