Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 6 Sep 2018 21:02:10 -0400
From:      Ed Maste <emaste@freebsd.org>
To:        Warner Losh <imp@bsdimp.com>
Cc:        FreeBSD Current <freebsd-current@freebsd.org>, tech-lists <tech-lists@zyxst.net>, Kurt Jaeger <pi@freebsd.org>
Subject:   Re: github freebsd and svn freebsd
Message-ID:  <CAPyFy2BGtxWQdHS=a0-=bWRArjSS61QZuJ7LoEUpvGQihOsjzw@mail.gmail.com>
In-Reply-To: <CANCZdfo-xfO_0NEg8Lc0zsY%2BSb6QmOwfFkRy3SV6RcnOY6jPnQ@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>

next in thread | previous in thread | raw e-mail | index | archive | help
On 6 September 2018 at 20:11, Warner Losh <imp@bsdimp.com> wrote:
>
>> Assuming we're confident the issue in the svn mirroring process is
>> fixed and will not recur we can redo the conversion, with a one-time
>> change to all hashes from the offending commit on, and they would not
>> change again in the future.
>
> What is the upgrade story for current users? How do they cut over? We need a
> how to or something in the handbook.

Yes, we'd need to have a fully documented migration process, and we
should be able to have both 'old' and 'new' branches exist in parallel
for some time.

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

Because of the way git works the additional branch would result in
only a nominal increase in repository size.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2BGtxWQdHS=a0-=bWRArjSS61QZuJ7LoEUpvGQihOsjzw>