Date: Mon, 23 Sep 2019 14:34:24 -0400 From: Shawn Webb <shawn.webb@hardenedbsd.org> To: Ulrich Sp??rlein <uspoerlein@gmail.com> Cc: Sean Chittenden <sean@chittenden.org>, freebsd-git@freebsd.org Subject: Re: Service disruption: git converter currently down Message-ID: <20190923183424.ebnghzf67mx56aom@mutt-hbsd> In-Reply-To: <CAJ9axoSVhmSkNS6S1zTiwK5F3uUM%2B-8D2478=irZMeTjNxpnfg@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> <CAJ9axoSVhmSkNS6S1zTiwK5F3uUM%2B-8D2478=irZMeTjNxpnfg@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
--ndzuirdqly4wdq5z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hey Ulrich, I appreciate your hard work in maintaining the git mirror. Work like this can sometimes go unthanked. I want to take a moment to show appreciation for you and the FreeBSD project in maintaining the git mirror. I do have a few concerns with what was stated in your email. I've written my concerns inline. I hope this discussion is a positive one, wherein upstream and downstream can effectively come to a conclusion. On Mon, Sep 23, 2019 at 08:16:25PM +0200, Ulrich Sp??rlein wrote: > 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= and > >> 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 w= ill > >> 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 = explicitly ruled out because most of our corporate citizens use github to i= ntegrate changes from FreeBSD. Rerolling master was universally rejected w= hen we socialized wanting to do this due to the level of disruption this wo= uld cause. The feedback was that this would be a high-cost, low-value oper= ation. In the tradeoffs of purity vs pragmatism, pragmatism wins every tim= e (that is the FreeBSD way). > > > > -sc >=20 >=20 > 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. >=20 > 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: >=20 > - git diff origin/broken_master mybranch > mybranch.patch > - git checkout -b fixed_branch origin/fixed_master > - patch < mybranch.patch Such a workflow breaks historical accuracy. Instead of `git annotate` showing the history properly, it's now based on an "epoch commit". Sure such a commit brings the branch to a working condition, but at the cost of history. >=20 > 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 I so wish that were possible for certain downstream projects. We're unable to upstream the majority of our work. To argue "upstream your work and you won't be affected" is to choose an argument that does not reflect the reality of a growing portion of FreeBSD's downstream consumers: the inability to work effectively with upstream. Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 --ndzuirdqly4wdq5z Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAl2JECsACgkQ/y5nonf4 4foaRg/9EpwjCx65K5HRnjLT4Ml169J8xVsTtZNQ+CWdrDA5yTACQ8R+YRqZO7hz IQS1IdYSV5tDmLQLYMbXeUpUyn1hknXywSiN2+fm+ZgGH/nulhEucomiAh/eG/PW 0gw1hFPSbx1CVV2wttVSbmpCun8ggsgVviGUv/ZLmeM9sU0BJi6O8OHi80l2+qdF m2kO25Kx2hKgrbECNeg6z2P0NMyswoZdY25fzVVMEUK77n9sUpyb8KpGpvN1pxRd 967PtG0teVxlTCn8zTaOB13TCMv4HWzefnnv2+74SA8otObPsJpGr52C36lhIBpS /h652fyGM+0dBzoFe+Fqrr4oGWm6F3uUlqQrXDsCjF5cmISfthGf1YtwdtQJ0y4B sCdGY4FzrR7yVcR7iFosTg0uqs3hfYOzA0vW90DPhyVi30ofvdBn2hn7a7V5HbVv QQrLxmrqQcVwtIFAGQsIJqEz/oPSjA+VCAOKUGGX+HgC5KNZqEpiYe6URd5MW+wh tXaXY5+TCcfKiCOrnVNT62rK9Sy/w2fQv7LlCltOZMabkvXKdfFsJc0WFbpWa6DU C5nq41e9nA2ZuOTXNPUpEtCTwBrIsCk37HC/CApGI/x3UHXKxoztbClNwchIWYFL ncJSLsMBYaKljAp63fhg+qKWJFJwSNVDHqzEG1ouiFNfucE4gm0= =gzjI -----END PGP SIGNATURE----- --ndzuirdqly4wdq5z--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20190923183424.ebnghzf67mx56aom>