Date: Sat, 3 Aug 2019 12:00:12 +0200 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> To: Ed Maste <emaste@freebsd.org> Cc: Warner Losh <imp@bsdimp.com>, freebsd-git@freebsd.org Subject: Re: github freebsd and svn freebsd Message-ID: <CAJ9axoSEZPxRqZip6gkhLP7KNW_nmKKfNoQ1%2BRT-VpXKMy8TYQ@mail.gmail.com> In-Reply-To: <CAPyFy2BKe%2BfcXzcOTeLQHEhDrJeS04pQqpBd7pF0WQMtn44qfQ@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> <CAPyFy2BKe%2BfcXzcOTeLQHEhDrJeS04pQqpBd7pF0WQMtn44qfQ@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Am Do., 25. Juli 2019 um 16:32 Uhr schrieb Ed Maste <emaste@freebsd.org>: > 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. > We can't really leave it in this state forever, because it's hard to verify that the SVN and the GIT repo are really in sync (well, you just check out head and "diff" the working copy, done, but people re-creating their own copy will see everything differently and freak out). And to be honest, the cvs2svn conversion turned so much of the old history into garbage, that we should either fix them (impossible?) or cut our losses and have the git history end at the point when cvs was switched to svn, at which point the history is sane again. hth Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoSEZPxRqZip6gkhLP7KNW_nmKKfNoQ1%2BRT-VpXKMy8TYQ>