From owner-freebsd-git@freebsd.org Tue Sep 24 13:48:25 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 ED975127588 for ; Tue, 24 Sep 2019 13:48:25 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lf1-f42.google.com (mail-lf1-f42.google.com [209.85.167.42]) (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 46d2Zx0w1Xz4V41 for ; Tue, 24 Sep 2019 13:48:24 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-lf1-f42.google.com with SMTP id w6so1473028lfl.2 for ; Tue, 24 Sep 2019 06:48:24 -0700 (PDT) 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=I7Zbd424UkQnRyvvwXPfelbbJpGPF9O3Xd9QSbKcY/U=; b=g2w9BcYqQH/6ecEt4hmX9sYlALmD1Lu74qbBYJxlvvpkTDfa9TbIjmUFcSewd6jq5t Yvk+rR/r9ufZEcY4M3R9ePNLm6rd0bu9F1HbD5Xq4TtDuyxpy/jdvb74UM0bkMUxPTBi Tg95Zg126RG6ahL49L1+DMwsw+Us7pxJqULaKZE5ccNIRAyhmHmMH/Arux7kMbuf6J2c /RTd+USxpGmqTfa5wjhbrvGxBvNXDIv2BV/8my2ShY19SZ5oRenlirLPFhh09n99OkuC QNXmb0c3isxC+5bs2zu7Rhnb/H5A47hwnVU/S4d/HP4WO/v1yjoqIQSdPJihNplPZlvF AN1g== X-Gm-Message-State: APjAAAV2CX+ksUFeFlg48kixmp8CC0j7HQvcQxImaJ6ULXkkaGCm3jru PaSQUlg5UQixAt1MqMWCphyxCC/vh4Qd3pv3I0kCKsSocgI= X-Google-Smtp-Source: APXvYqxI/ipng8hgQ94KDgdQnD9sxdEXy+PWaDVc5/ftT2FY0qAawcs8t7/AfEpWj7IpD3fiTw/ao7CIXx7/HouqCqs= X-Received: by 2002:ac2:48ba:: with SMTP id u26mr2000297lfg.164.1569332903251; Tue, 24 Sep 2019 06:48:23 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Tue, 24 Sep 2019 09:48:10 -0400 Message-ID: Subject: Re: Service disruption: git converter currently down To: Sean Chittenden Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 46d2Zx0w1Xz4V41 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.167.42 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.21 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[42.167.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.22)[ip: (-0.53), ipnet: 209.85.128.0/17(-3.30), asn: 15169(-2.20), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[42.167.85.209.rep.mailspike.net : 127.0.0.17]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] 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: Tue, 24 Sep 2019 13:48:26 -0000 On Mon, 23 Sep 2019 at 13:51, Sean Chittenden wrote: > > > > > 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). > > > 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. Unfortunately it's not just a few instances of bogus metadata (commit timestamps and authors), there are also a cases where the git conversion misrepresents the operation performed and makes for confusing history. One example of this is r306097 / df422cbea30e. A file that had been removed in head needed to be restored, and in SVN it was done by copying from the stable/10 branch. The git converter interpreted that as a merge, and then grafted the post-branch stable/10 history into head as a result. That is why we have a bit over 9000 stable/10 commits showing up in 'git log origin/master'.