Date: Mon, 23 Sep 2019 20:16:25 +0200 From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uspoerlein@gmail.com> To: Sean Chittenden <sean@chittenden.org> Cc: freebsd-git@freebsd.org Subject: Re: Service disruption: git converter currently down Message-ID: <CAJ9axoSVhmSkNS6S1zTiwK5F3uUM%2B-8D2478=irZMeTjNxpnfg@mail.gmail.com> In-Reply-To: <CAHevUJHwDet8pBdrE4SN3nuoAUgP-ixpCz9uOTdwbE31UDDsbA@mail.gmail.com> References: <CAJ9axoR41gM5BGzT-nPJqqjym1cPYv31dDUwXwi4wsApfDJW%2Bw@mail.gmail.com> <CAJ9axoToynYpF=ZdWdtn_CkkA2nVkgtckQSu%2BcMis1NOXgUdnA@mail.gmail.com> <CAJ9axoR2VXFo9_hx9Z1Qwgs7U-dkan56hrUKO9f7uN6Wpd15xQ@mail.gmail.com> <CAHevUJHwDet8pBdrE4SN3nuoAUgP-ixpCz9uOTdwbE31UDDsbA@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
Am Mo., 23. Sept. 2019 um 19:51 Uhr schrieb Sean Chittenden <sean@chittenden.org>: >> >> Please note however, that more "garbage" metadata escaped from SVN into >> github, meaning 3rd parties have a hard time re-running the conversion a= nd >> making sure that it matches SVN down to the metadata (i.e. timestamps). >> >> Eventually, this will have to be re-rolled and a new "master" branch wil= l >> be force-pushed into github. There's no timeline for this yet. > > > Wait, what? Can you elaborate? > > Discussion of a force-push to github has occurred a few times and been ex= plicitly ruled out because most of our corporate citizens use github to int= egrate changes from FreeBSD. Rerolling master was universally rejected whe= n we socialized wanting to do this due to the level of disruption this woul= d cause. The feedback was that this would be a high-cost, low-value operat= ion. In the tradeoffs of purity vs pragmatism, pragmatism wins every time = (that is the FreeBSD way). > > -sc This is not just about pragmatism and the disruption it would cause is vastly overblown by people who don't seem to know much about the git storage model. There *is* garbage metadata in the published version on github, there *is* a disclaimer on https://wiki.freebsd.org/GitWorkflow since forever, and the cost of switching from 1 published branch to another is literally: - git diff origin/broken_master mybranch > mybranch.patch - git checkout -b fixed_branch origin/fixed_master - patch < mybranch.patch It should also be possible to merge both broken and fixed master into your branch (at the exact same SVN revision in time) and then you can follow fixed_master going forward. You'll schlepp around double the commit history, but not tree objects. If you want to retain history, you can upstream the changes prior to the switch, or do something more elaborate with git filter, maybe. This should be no surprise to anyone who's been reading up on the conversion workflow or following the various email threads. It is currently impossible to re-create the published repo w/o doing elaborate SVN metadata surgery. That is no state to be in, it is not pragmatism. hth Uli
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAJ9axoSVhmSkNS6S1zTiwK5F3uUM%2B-8D2478=irZMeTjNxpnfg>