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. > > pgprhgs18t2H8.pgp Description: PGP signature
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
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. pgpg80dxm9pfi.pgp Description: PGP signature
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
Ulrich, Are you still hoping for feedback on this? If so I am currently setting up to run your scripts from: http://wiki.freebsd.org/GitWorkflow#History Let me know if that is not needed though because if I don't need to then I can save myself a bunch of work. I'll report back to you on my success or not. -Alfred On 12/15/12 5:22 AM, 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. ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
On Sat, 2012-12-15 at 16:44:52 -0800, Alfred Perlstein wrote: > > > On Dec 15, 2012, at 1:16 PM, Ulrich Spörlein wrote: > > > > Ok, scrap that, I have too many copies of the conversion lying around > > and got confused. > > > > I'd like to thank all who reported in with hashes of their conversion > > run and will make sure all is solid tomorrow. > > > > Thanks. I am wondering will the new repo include svn revision numbers in the > git commit logs? > > Thank you. Not in the logs, they are stored in git notes. If you don't have em, run the following: git config add remote.origin.fetch '+refs/notes/*:refs/notes/*' git fetch The git log will then produce output like this: commit c3c1c81918dd701cfecb370f591746bacc907e4d Author: rwatson Date: Sat Dec 15 15:21:09 2012 + Four .c files from OpenBSM are used, in modified form, by the kernel to implement the BSM audit trail format. Rename the kernel versions of the files to match the userspace filenames so that it's easier to work out what they correspond to, and therefore ensure they are kept in-sync. Obtained from: TrustedBSD Project Notes: svn path=/head/; revision=244267 You can search for a specific revision like this: % git log --grep="revision=234567" commit 0264d1ea29a4b35914a658ab01ece38e3637f84f Author: delphij Date: Sun Apr 22 07:51:49 2012 + - Use quote when tab is used; - Follow the same macros used in device driver manual pages. Notes: svn path=/head/; revision=234567 hth Uli ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
On Dec 15, 2012, at 1:16 PM, Ulrich Spörlein wrote: > > Ok, scrap that, I have too many copies of the conversion lying around > and got confused. > > I'd like to thank all who reported in with hashes of their conversion > run and will make sure all is solid tomorrow. > Thanks. I am wondering will the new repo include svn revision numbers in the git commit logs? Thank you. -Alfred ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
On Sat, 2012-12-15 at 22:07:46 +0100, Ulrich Spörlein wrote: > On Sat, 2012-12-15 at 16:10:46 +, Chris Rees wrote: > > On 15 December 2012 13:22, 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. > > > > 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?) Ok, scrap that, I have too many copies of the conversion lying around and got confused. I'd like to thank all who reported in with hashes of their conversion run and will make sure all is solid tomorrow. Thanks again, Uli ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
On Sat, 2012-12-15 at 16:10:46 +, Chris Rees wrote: > On 15 December 2012 13:22, 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. > > 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 ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
On 15 December 2012 13:22, 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. 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? Chris ___ freebsd-current@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
HEADS UP: FreeBSD git mirrors demoted to beta status, need your help
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. pgpgTTyb66P1B.pgp Description: PGP signature
