From owner-freebsd-git@freebsd.org Thu Jul 25 14:32:51 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 15946A600F for ; Thu, 25 Jul 2019 14:32:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f44.google.com (mail-io1-f44.google.com [209.85.166.44]) (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 828DE852D1 for ; Thu, 25 Jul 2019 14:32:50 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f44.google.com with SMTP id f4so97712046ioh.6 for ; Thu, 25 Jul 2019 07:32:50 -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; bh=qF+8Qu2Oo+mY9f/+fOVNjBVjYyMBxolwf6baONDl4Fo=; b=PLWr6VTo8s9was5WpPvkmJ+7vPwr46bIlXupii8tiPhDJRYAfJ+a5N39Hs45b9O3xj uXaJgMTlwR0ACAxcJ59oNoHZxZZ4TEoSzypCGjAbLjmWFyem9japGaIg79Ff7LDLgfJc 4HPULd6Rh12LvsPdYB2mNR4y7MfdQ0SoA1KvnJgIwBzA50yMco46CYwvSbhyFh+tTsyw +jmfAX/7Aj/pb6wSCCEg3O52aZOb71Y6qzkvoKfZe5ytfAyIHF6haeEqWuuAZbW13n14 JR76b3aRmzcffIHJq4Nlo/QdJ+QzydSwS2B6yzYFBca95mWyq+n7QRoalfcuDYZGx3RQ Xw3w== X-Gm-Message-State: APjAAAV1TAAYkDjfWsOmTsEOFpebOQDcspYZgK/R5b4HsLwsExx2rRsS Ch41zpMDZAX0sZis0C6XZo9M2WXsyVPHgJuhp4k= X-Google-Smtp-Source: APXvYqzeaMu4vDwdQeykydP7cH85uL7TWIsYTK1aftKVmzXaOiMAFjbckWIoJrgsNA/rnZQwwu+zgS3PaGTijmGAHug= X-Received: by 2002:a02:7c2:: with SMTP id f185mr91951594jaf.16.1564065164141; Thu, 25 Jul 2019 07:32:44 -0700 (PDT) MIME-Version: 1.0 References: <18a5abcc-afbc-41c3-75ed-e33607e70c8f@zyxst.net> <20180904105302.GD2118@home.opsec.eu> In-Reply-To: From: Ed Maste Date: Thu, 25 Jul 2019 08:53:02 -0400 Message-ID: Subject: Re: github freebsd and svn freebsd To: Warner Losh , freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 828DE852D1 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.44 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-5.13 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; 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]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MX_GOOD(-0.01)[cached: alt3.gmail-smtp-in.l.google.com]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[44.166.85.209.list.dnswl.org : 127.0.5.0]; NEURAL_HAM_SHORT(-0.95)[-0.947,0]; RCVD_TLS_LAST(0.00)[]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; 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]; IP_SCORE(-2.18)[ip: (-4.97), ipnet: 209.85.128.0/17(-3.42), asn: 15169(-2.43), country: US(-0.05)]; RCVD_COUNT_TWO(0.00)[2] 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: Thu, 25 Jul 2019 14:32:51 -0000 In response to a discussion about bogus metadata attached to some Git commits due to (since-fixed) issues in the FreeBSD SVN mirroring setup, and the possibility of fixing that: On Thu, 6 Sep 2018 at 21:02, Ed Maste wrote: > > One way we could handle the mechanics of the migration itself is: > > * Create an alias for the current master branch - say, master-gen1 > * Continue running the existing conversion > * Start running a fixed svn-git conversion which pushes to master-gen2 > * Document the process for migrating downstream work from one to the other > * Switch master to master-gen2 > * Deprecate master-gen1 after a suitable period Alternatively, we can just leave it as is and accept that the Git history will forever have these quirks, and will not be easily reproducible by third parties. In any case I wanted to provide some information for future reference. I believe these are all of the commits with 'svnmir' metadata: 06375ea686601e39c3d2f21e9576b0a450f22036 9c3b950c988087947d7fbe9c98e2507def26a748 3dcae3d578040f56b4160c84dff9f6c0058957ac b57378964869e9a06b5da934bf4a7696ec950ba4 c5e8194f33abf05314599d63c1e00d01aa354f47 b6f1d41eacf4c28a5fd409b6080579ef674dcd08 fcec91b0d8c84eacea23841e9ed20ddf40b6fd1b a5c351dbcd0eb2f90aaccbd113760526a05c3953 c5dd590220d0afe971d065bfe9324f549dd00968 f974a6368a30171712d61f5383afce1f1fe96bf1 6416b56f5a3923c6c264b46365e16718ccabf081 30185114e933b00142bfb617a492cbb266e059c5 91308aec6ca93cab82659cd43b3f6a83d366350b 9b61eb04fd675b6e65c99b0c82bddfd384880f30 e3a73b4cd52efd8645efcf07184f8eff1ff3339d They're all on one of these dates: 20 July 2015, 4-9 Aug 2015, 14 Jan 2016 As an example c5e8194f33abf05314599d63c1e00d01aa354f47 is: % git show --notes --pretty=raw c5e8194f33abf05314599d63c1e00d01aa354f47 commit c5e8194f33abf05314599d63c1e00d01aa354f47 tree d300551a8d33164568294340455656c11150eacc parent abef15cd813ec731ce02f90e20feb9e29ed750e9 author svnmir 1438695626 +0000 committer svnmir 1438695626 +0000 Ensure the local MANIFEST is always used when verifying remote distribution sets. MFC after: immediately Sponsored by: The FreeBSD Foundation Notes: svn path=/head/; revision=286285 We also have history from stable/10 grafted into git master -- r306097 restored a deleted file by copying a version from stable/10, and the svn->git process brought along the entire stable/10 history with that. We also have stable/6,7,8 history and even releng/8.1. I count 20819 stable and releng commits in "git log origin/master".