From owner-freebsd-git@freebsd.org Mon Sep 23 18:42:27 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 B4E0EFC72E for ; Mon, 23 Sep 2019 18:42:27 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-x244.google.com (mail-oi1-x244.google.com [IPv6:2607:f8b0:4864:20::244]) (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 46cY8f5h2Hz4Mjn for ; Mon, 23 Sep 2019 18:42:26 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-x244.google.com with SMTP id w144so8520442oia.6 for ; Mon, 23 Sep 2019 11:42:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=uAcamWXF9RYfzTwS8kWzk+Zsn88KlEiruxUzo2h0UOs=; b=V0FuuSBJfXV6ZwlOgZSUltEEijauBwS2h5jfJT9DfojHYJE0hlm2NhNWtyQL74iAuk phR+WnHigB9BOIf7fdoTfr6ezXCmMkU4z3RkUftXsa6UpD9Z5Iki7UJ+XN4lToGVE+xW LtSAI0wrm209/Bg8NJaUv0zj1M3byYtLFa+bAq5BP3mOS/dzhaTkYeN4jHNc3keGfe1H e2w/IsDt+Nu2S6t+vXdeNAfp4UMpk255QXkTgCMWEnIdgV2Z7pjfK2mQAeoVHpBM8JvM ryHcxmjK72gIFRov+tgHNG90y9idacuCsV5tlzRxmgTlayk/RTYgZoo3Mr3bx5vjW+a5 M5Sw== 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:content-transfer-encoding; bh=uAcamWXF9RYfzTwS8kWzk+Zsn88KlEiruxUzo2h0UOs=; b=nzeDXKbYaRJ+y71JHyooEQlbaf8VmZljkBEDavzv1j3Nyn4cgRSkbXeq/JUmGosDDF BJKFZAHxHDFnXUx3S+R9lUOdjAntGOXhtui3+HCw8YBwwiq+t/Iky/UpVqOO8A5TwJJr xm8hGF1gcdDLCCC/3DMOx0K2I6SpnCKTdiGfBlQ5TEAjye/Ds9CYLnmN6nUDsv3HHm1n OgZ0A1dueJorTr3ieuvoUvvNtU49SNdLT+/a+PZqpud/LDk3yRwbFM0sSZs9XfRbck33 kRHOsxjwTWDURIu4f4Ym/rmHLTDgok/eyciy3FxJA1jo56bP2c+lt0FZcVIHxYss9/cN sTJw== X-Gm-Message-State: APjAAAUPiE+Z+DW8Dy6gLfIhCaj5CcOLSQNng/gUfDoD14Yfav8M04TH VFygEqrJ/57EG3vDAjiqE2CpHp6OvYIe8JuuU7w= X-Google-Smtp-Source: APXvYqzPNyq82H1ApdNf7JlaFYX9SSBW5HPcEEkN8L+NB0Qx+6QxXqNYIwVRJ7s2tuROtDgnZKRqv7IDHPevejcXx/I= X-Received: by 2002:aca:2819:: with SMTP id 25mr1319683oix.42.1569264145274; Mon, 23 Sep 2019 11:42:25 -0700 (PDT) MIME-Version: 1.0 References: <20190923183424.ebnghzf67mx56aom@mutt-hbsd> In-Reply-To: <20190923183424.ebnghzf67mx56aom@mutt-hbsd> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Mon, 23 Sep 2019 20:42:10 +0200 Message-ID: Subject: Re: Service disruption: git converter currently down To: Shawn Webb Cc: Sean Chittenden , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46cY8f5h2Hz4Mjn X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=V0FuuSBJ; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 2607:f8b0:4864:20::244 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; TO_DN_SOME(0.00)[]; IP_SCORE_FREEMAIL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; RCVD_IN_DNSWL_NONE(0.00)[4.4.2.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]; IP_SCORE(0.00)[ip: (2.17), ipnet: 2607:f8b0::/32(-2.64), asn: 15169(-2.20), country: US(-0.05)]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com.dwl.dnswl.org : 127.0.5.0] 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:42:27 -0000 Am Mo., 23. Sept. 2019 um 20:34 Uhr schrieb Shawn Webb : > > 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 > > : > > >> > > >> Please note however, that more "garbage" metadata escaped from SVN i= nto > > >> github, meaning 3rd parties have a hard time re-running the conversi= on and > > >> making sure that it matches SVN down to the metadata (i.e. timestamp= s). > > >> > > >> 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 bee= n explicitly ruled out because most of our corporate citizens use github to= integrate changes from FreeBSD. Rerolling master was universally rejected= 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 op= eration. In the tradeoffs of purity vs pragmatism, pragmatism wins every t= ime (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 > > 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. Is there really that much value in having "git blame" work in that environm= ent? My mental model is of short-lived branches that get upstreamed, so I'm bias= ed towards this not being all that big of a problem (for some at least). > > > > 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. :/ I'm 80% sure that you can just merge both branches and things will be fine (though the exact incantation will surely be black magic). I'd love to try this on an actual repo though, I don't have the time to craft some test repo to ver= ify this assumption, and then find out that other repos are different). Also, I'll be offline in the coming weeks, so don't expect immediate respon= ses from me going forward. I already had to spent most of my weekend to patch things up and had to cancel other plans. Cheers, Uli