From owner-freebsd-git@freebsd.org Mon Sep 23 18:16:42 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 33898FBB80 for ; Mon, 23 Sep 2019 18:16:42 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-x342.google.com (mail-ot1-x342.google.com [IPv6:2607:f8b0:4864:20::342]) (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 46cXZx2yyGz4KtJ for ; Mon, 23 Sep 2019 18:16:41 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-x342.google.com with SMTP id g25so13030067otl.0 for ; Mon, 23 Sep 2019 11:16:41 -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=MYjt/BsYyQLprhfhXl3bS3lTBzb6n5OhvpeMWWSqdM8=; b=JRemSZ+XCvm/+j5iFNyqzwkiKDtEqzHcs2h92eXYfZEWClFZ3+NTB6otB7iTPDvg63 G/uTuT0Ox5Tic7aUX3RFeeBO46RXKATUGoOWXuIfj4U9FnAwInuzjF1KARtQS3nRt8hV XvgNfXkJPkR8npia9UseJ0P0YumsvMgGwZ86DtcBeB7pl84cj9FeuElQjghTBL9wd5o1 jgLIuN47vP+lNygrh/NQWIWpm5t0l0Yo68O++EVK2MfPei4Jxc9WBQb1/kAHaX4bvsks VawTfMK12X0gA06C1GedXLny73EgkAppSz/URbYzYn6VD+4FoqzUSSplIG+JO8qnAt1l 8hZw== 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=MYjt/BsYyQLprhfhXl3bS3lTBzb6n5OhvpeMWWSqdM8=; b=nBodG+OFCru2QIFReFCzSfErjYyMq3MW3Oc9B+hDv2BwbX73+q4aPMlKWxjNzTYmiK 03UfSP/JnqJL+PXyvyyh6nuwjzCo+Q0Ir0Wscbo9k183iAtqUkraWVdtvCxVV2f/a3bF qPSTpDv9z3Sqv/Q3AkLq8/mI4udDQUHwkpt5I2toovWrZrMU/9zJs/vVmDP/d5ytt+sG NUqbiGBmvFHZDEx2NE8CZ2WyO7PoCEIFTdk0TR/C34lZG6GohR8Mvt+H68uxNthKbh5J nlI5cRNJhNDXXMFfTPgIAeZCL4BfTBEJFlin4dGK0wk4A0WhW+q+M1vRXkml2rfG9p98 pkgw== X-Gm-Message-State: APjAAAUYuoTRxorO3uiGvk+guSvxlQugATFwv2/o5tAUBMvo0SYMi5VK kGVjx7Z94nfDDmryReeHdaOomNQ3hq3+2XIN8ag= X-Google-Smtp-Source: APXvYqwsUvdUur4OGxbvGuOxpTGHBB1jRXf/UjQh7x2xeC7maSDYHCDnh/Gn05wmFbvMG8yNzOkJmUx+9IPR963wDQg= X-Received: by 2002:a05:6830:1e2b:: with SMTP id t11mr993875otr.119.1569262600015; Mon, 23 Sep 2019 11:16:40 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Mon, 23 Sep 2019 20:16:25 +0200 Message-ID: Subject: Re: Service disruption: git converter currently down To: Sean Chittenden Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 46cXZx2yyGz4KtJ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=JRemSZ+X; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 2607:f8b0:4864:20::342 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)[]; TO_DN_SOME(0.00)[]; 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]; IP_SCORE_FREEMAIL(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2.4.3.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]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; IP_SCORE(0.00)[ip: (3.09), 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:16:42 -0000 Am Mo., 23. Sept. 2019 um 19:51 Uhr schrieb Sean Chittenden : >> >> 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