From owner-freebsd-git@freebsd.org Mon Sep 23 18:51:01 2019 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6162AFC7E6 for ; Mon, 23 Sep 2019 18:51:01 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82e.google.com (mail-qt1-x82e.google.com [IPv6:2607:f8b0:4864:20::82e]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46cYLX3nttz4Mt9 for ; Mon, 23 Sep 2019 18:51:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82e.google.com with SMTP id d2so18459620qtr.4 for ; Mon, 23 Sep 2019 11:51:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=sreoeKHU50Ysmyp/QpSfcHKSeAaLfLQeZloxVDSmU3A=; b=0QsF4VXA+vE3AWXoLle3kjlZ9qAttuPvEcQLUihiu0qqEAawWNuHRAUJjqvt9FTlZk lKO+9OMXEqnDjcWn6nkslPU29ZtAGGDZEEl/YcCFbRl8V/9LPHHbBbLD9HieYwNomeal DP9pnbo6IblP111SPcCkhfJiXNfTBMUbd88A51hQpQVsWd9W4uD+T8eLPOS2VuZlSrZo Tm2sIUb9mWVhzZrBThgKFXx4UK+JLmjVCISOUI1j0RIzcpV7pXn+OAXRLuliTP+dAu+D AF9HP/eWmfwSeQ/awlsQZB9QHcc2sBpQx7TdDBMvNsh8tXO9WC3BzErhtcIRHKNI/lQ1 dFFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=sreoeKHU50Ysmyp/QpSfcHKSeAaLfLQeZloxVDSmU3A=; b=W7r1w5h4QXSAK/DBO6AoJmpIoAnrYaWtCCm6AKJ/sfaGbi8OMEdHhUPAb2d0FQSks7 DJZJLBmD7tkYrdNTkRsuNqySNXLydWQe9T440BwUbqOYToW3rLbVgZ6/nSPySwzI2a04 IC0UrViljs8D7Y9HCqoXfyDg4lul9kKuPxibJ2mQn+6+vT8Pd+L4EiS5mAqWZCbYbtAr 9qqzbisEQtKZHjs1c2YpVqv7+jebRar+Ad5e3qI/HnZhv+9FY1KKLsI4GUECj45HyW3A p5VfnKKYJDZRBp03r7I8r4cWyTc+98ju12Pb35dfmZTenkc/svRWNyxlW1q2O6pjo3Cn ejWA== X-Gm-Message-State: APjAAAXrHRGD6tgHgHxXJx4TcsmcAlHp5CIfdggpGm76bG3bmvCYndvn pEv9BYex76Ty7/7T8Kllk3YHhW8oMb6WVlwaSoZMgMLQ7Fo= X-Google-Smtp-Source: APXvYqx7RafWeMXCkIKy2Y10RY2dKZoBsl6Qtnpnt4dhPof+9+DCPFe2Zz7unz56gQpNLtX67ElMXiUZJSsYVQj/Yi8= X-Received: by 2002:ac8:1208:: with SMTP id x8mr1531662qti.32.1569264659149; Mon, 23 Sep 2019 11:50:59 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Mon, 23 Sep 2019 20:50:44 +0200 Message-ID: Subject: Re: Service disruption: git converter currently down To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Sean Chittenden , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 46cYLX3nttz4Mt9 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=0QsF4VXA; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82e) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.84 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[e.2.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.84)[ip: (-9.31), ipnet: 2607:f8b0::/32(-2.64), asn: 15169(-2.20), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Sep 2019 18:51:01 -0000 On Mon, Sep 23, 2019, 8:16 PM Ulrich Sp=C3=B6rlein w= rote: > Am Mo., 23. Sept. 2019 um 19:51 Uhr schrieb Sean Chittenden > : > >> > >> Please note however, that more "garbage" metadata escaped from SVN int= o > >> 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 > will > >> 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 > integrate changes from FreeBSD. Rerolling master was universally rejecte= d > when we socialized wanting to do this due to the level of disruption this > would cause. The feedback was that this would be a high-cost, low-value > operation. In the tradeoffs of purity vs pragmatism, pragmatism wins eve= ry > 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 > Not a viable option. We have hundreds of commits in our tree at work and this would destroy the history there. A crazy set of rebase might work, but that's tricky too and would need to be scripted. It's possible, but a lot of pain for what most people will regard as zero real gain. 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. > We are long past this warning being enforceable. This would hit about 100 branches I have in progress. 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. > We know this. The pragmatism is that we don't really need to be that pure. Warner hth > Uli > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >