From owner-freebsd-hackers@FreeBSD.ORG Wed Jan 16 10:34:42 2013 Return-Path: Delivered-To: hackers@FreeBSD.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id 1EB2EF92; Wed, 16 Jan 2013 10:34:42 +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 9F872B61; Wed, 16 Jan 2013 10:34:41 +0000 (UTC) Received: from localhost (acme.spoerlein.net [IPv6:2a01:4f8:131:23c2::1]) by acme.spoerlein.net (8.14.6/8.14.6) with ESMTP id r0GAYeBJ047468 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO); Wed, 16 Jan 2013 11:34:40 +0100 (CET) (envelope-from uqs@FreeBSD.org) Date: Wed, 16 Jan 2013 11:34:40 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: current@FreeBSD.org, hackers@FreeBSD.org Subject: Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help Message-ID: <20130116103439.GS35868@acme.spoerlein.net> Mail-Followup-To: current@FreeBSD.org, hackers@FreeBSD.org References: <20121215132246.GH69724@acme.spoerlein.net> <20121230113834.GG69724@acme.spoerlein.net> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="brEuL7wsLY8+TuWz" Content-Disposition: inline In-Reply-To: <20121230113834.GG69724@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 List-Id: Technical Discussions relating to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2013 10:34:42 -0000 --brEuL7wsLY8+TuWz Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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=C3=B6rlein wrote: > Just a reminder that this re-roll will happen in almost two weeks. >=20 > 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. >=20 > Regards, > Uli >=20 > 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. >=20 >=20 --brEuL7wsLY8+TuWz Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.13 (FreeBSD) iQEcBAEBAgAGBQJQ9oI/AAoJEKOmmGRKr4LOZw8H+QHI37qmjUjjiNZuR2HlHCUy oR1vfHi8HxFhHVvklo93K/1Qc6PnuxvzqCaeUPtr2JlqDN8l3HpI6RfGyJ5fw2Ja qy9/EBsyWhLsMHzKUsJhV7rm1Z/2Z0DqpxIhywy4TvghVBdL/5Vwzv/BtzFBrpyD 3kKfbbGStoDEkc54hP+P1/3B/6UUpXk0Hush9xrw2PkwPUWlbwjlz/iBgN6jhOkX KC8UtM9XNz5XOUGVSOR3Qb6psl5Fk9Qg9VcXVHVvtdth5LvvLglEU48WICpo65SP rJ8a3AkEyGjet1oUyiM5YZ5Bc5z1GoZn83iC1PganHA7cOR0HdLC1wCKkUkWrXI= =CSit -----END PGP SIGNATURE----- --brEuL7wsLY8+TuWz--