Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help

This has been completed, your next pull will result in a
non-fastforwardable change and I'd advise you to re-branch from
origin/master instead.

If you run into any trouble, don't hesitate to contact me directly.

Thanks and sorry for the inconvenience,
Uli

On Sun, 2012-12-30 at 12:38:34 +0100, Ulrich Spörlein wrote:
> Just a reminder that this re-roll will happen in almost two weeks.
> 
> Thanks to a couple of volunteers, I now have independent confirmation
> that the process is deterministic and repeatable and the switch can
> progress as planned.
> 
> Regards,
> Uli
> 
> On Sat, 2012-12-15 at 14:22:46 +0100, Ulrich Spörlein wrote:
> > Bad news everyone,
> > 
> > tl;dr The git mirror of the source repository needs to be re-rolled to
> > make the conversion deterministically repeatable, this will change
> > pretty much all git commit hashes.
> > 
> > The re-roll will be done January 15, 2013.
> > 
> > Not affected are the ports and doc repositories, nor is the svn_head
> > (for use with git-svn) affected.
> > 
> > 
> > Background
> > 
> > The converter (svn2git) was handing commits and objects to git's
> > fast-import in arbitrary order, this makes merge commits have an
> > arbitrary order of their parent commits and thus these merge commits
> > have changing commit hashes for each converter run.
> > 
> > This has been fixed, but requires us to move all the branches over to
> > this deterministic scheme, which will change all their commit hashes.
> > None of the contents of these commits change, so rebasing/remerging your
> > work into these branches is possible without running into any merge
> > conflicts.
> > 
> > 
> > We need your help
> > 
> > A goal of these conversions is to have them repeatable by you (yes,
> > you!), so the correctness of the conversion can be verified. There are
> > also no backups of the conversion runs, as they should be repeatable
> > anyway.
> > 
> > We need 2-3 volunteers to run these conversions themselves and verify
> > that the produced commit hashes match the published ones. The necessary
> > steps to do this are documented on the Wiki under
> > 
> >    http://wiki.freebsd.org/GitWorkflow#History
> > 
> > Please send me your output of git show-ref in a private mail, thanks.
> > 
> > Cheers,
> > Uli
> > 
> > PS: This re-roll has nothing to do with the recent security incident.
> 
>