From owner-freebsd-hackers@FreeBSD.ORG Sun Dec 30 11:38:36 2012 Return-Path: Delivered-To: hackers@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BEDC221D; Sun, 30 Dec 2012 11:38:36 +0000 (UTC) (envelope-from uqs@FreeBSD.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by mx1.freebsd.org (Postfix) with ESMTP id 38D4B8FC12; Sun, 30 Dec 2012 11:38:36 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.5/8.14.5) with ESMTP id qBUBcYIR042292 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Sun, 30 Dec 2012 12:38:34 +0100 (CET) (envelope-from uqs@FreeBSD.org) Date: Sun, 30 Dec 2012 12:38:34 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: developers@FreeBSD.org, current@FreeBSD.org, hackers@FreeBSD.org Subject: Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help Message-ID: <20121230113834.GG69724@acme.spoerlein.net> Mail-Followup-To: developers@FreeBSD.org, current@FreeBSD.org, hackers@FreeBSD.org References: <20121215132246.GH69724@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="3MMMIZFJzhAsRj/+" Content-Disposition: inline In-Reply-To: <20121215132246.GH69724@acme.spoerlein.net> User-Agent: Mutt/1.5.21 (2010-09-15) X-BeenThere: freebsd-hackers@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list Reply-To: current@FreeBSD.org List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Dec 2012 11:38:36 -0000 --3MMMIZFJzhAsRj/+ Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=C3=B6rlein wrote: > Bad news everyone, >=20 > 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. >=20 > The re-roll will be done January 15, 2013. >=20 > Not affected are the ports and doc repositories, nor is the svn_head > (for use with git-svn) affected. >=20 >=20 > Background >=20 > 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. >=20 > 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. >=20 >=20 > We need your help >=20 > 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. >=20 > 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 >=20 > http://wiki.freebsd.org/GitWorkflow#History >=20 > Please send me your output of git show-ref in a private mail, thanks. >=20 > Cheers, > Uli >=20 > PS: This re-roll has nothing to do with the recent security incident. --3MMMIZFJzhAsRj/+ Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) iQEcBAEBAgAGBQJQ4Ce6AAoJEKOmmGRKr4LO78cH/RgCV96g7UAsI++NN6yKEHIA iinKYlwTiMOY981NJ79mc12YU5mffbdE8anjDK5K+MbOAqeoUl+AoG8KbafDqUEk yLL+nU3D2/iH/+FrenrGteJCOP+89NGfjuxTMi0yecoAnhQFOUt9t2PZOfvsTGFB VEG+ZynGD4b00odW7jwv8YBNbhWxI661ZIzU8GR9aUzVg4Iyk5ac7tWwXvgRQNTI TbtwHp+bh5MbTKXOsIAApcXy2liI1u1l94dxOkaSzEazeM7EBM/6d6NvLXk9PEMY uxzhc6E7z58+EY4VvzkBDTwr1jct1VISXjWIJqvohEHwN+Pf7b2SBSNAAY9F/cY= =yB0O -----END PGP SIGNATURE----- --3MMMIZFJzhAsRj/+--