Date: Sat, 15 Dec 2012 22:07:47 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= <uqs@FreeBSD.org> To: Chris Rees <crees@FreeBSD.org> Cc: "current@freebsd.org" <current@FreeBSD.org> Subject: Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help Message-ID: <20121215210746.GI69724@acme.spoerlein.net> In-Reply-To: <CADLo839c4siMXc9bOG-Y=Av9dAEjG1726sKVXCt%2B2BizEhkBgw@mail.gmail.com> References: <20121215132246.GH69724@acme.spoerlein.net> <CADLo839c4siMXc9bOG-Y=Av9dAEjG1726sKVXCt%2B2BizEhkBgw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, 2012-12-15 at 16:10:46 +0000, Chris Rees wrote: > On 15 December 2012 13:22, Ulrich Spörlein <uqs@freebsd.org> 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. > > Hey, > > http://www.bayofrum.net/~crees/scratch/git-show-ref.txt > > I hope it's what you were hoping for :) > > My local svn mirror is synchronised at midnight GMT (UTC). > > Need anything else? That was fast, thanks! I need to write up some comparison scripts first, because it's not a simple comparison (due to different SVN bases). I took a random branch that hasn't been changed in a while, though, and your hashes are different then mine. What versions of Subversion, APR, git and QT4 do you have installed? Can you make that repo available somewhere for me to pull (or better yet, rsync it with all the svn2git metadata?) Thanks Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121215210746.GI69724>