From owner-freebsd-git@freebsd.org Sat Aug 3 10:00:34 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 0144DAD10C for ; Sat, 3 Aug 2019 10:00:34 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f46.google.com (mail-ot1-f46.google.com [209.85.210.46]) (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 4610002MZdz47sm; Sat, 3 Aug 2019 10:00:31 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f46.google.com with SMTP id o101so80681456ota.8; Sat, 03 Aug 2019 03:00:31 -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=/utj22Plrnu1BTcqvid+fz80+RtP7a7vUi4cWZbt+v4=; b=PpnHeQedjW9ux0x865vQI9PxJnPsa6V4XDib1AKj14XbXG5egzVJSNw7Xe9D3LqLxm gLyaTCWnFk/tg4TFMRjQ7BFI08fyj+PGz2SCytIWR19fvQydq4RI03eLs5b/4NNhP34a Ngw/sJ9Wvb/umGxLA191MoTHUncw7Sle+S1/7pFgsi6llazKPJCRCU4ZZjbAPgu2tllP GltdzIrn8W8ww6KFfbcVLmc78XlbS0sawg3+NN06xeqdzUYtOKEFtPlZ+YCmMSJjoT0u 3QyHB3L2YNv2I5zXaLJ6Zu3usUiJ+J4H7ks3Bsulz6dG6oAu7t1tloK9k/S1GL9y0qo9 HSTw== X-Gm-Message-State: APjAAAXt/6Oh36r8mbb6mY3JTCOLjhLDwKntm2WAYa83yMMBFrwMH+Bz 9s23cazdFPAWUxG20KXNC+Q12mWP211z11P1514I+0z3 X-Google-Smtp-Source: APXvYqxFICwsTdnv/PEjtoupqdnPjIQS0xaEIxOAVDsNRTBRq1fpb1i7CfmOVLGj8fUDjmmDgNX8rbwl3FKtinKSRgk= X-Received: by 2002:a9d:5e99:: with SMTP id f25mr15074170otl.119.1564826429918; Sat, 03 Aug 2019 03:00:29 -0700 (PDT) MIME-Version: 1.0 References: <18a5abcc-afbc-41c3-75ed-e33607e70c8f@zyxst.net> <20180904105302.GD2118@home.opsec.eu> In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sat, 3 Aug 2019 12:00:12 +0200 Message-ID: Subject: Re: github freebsd and svn freebsd To: Ed Maste Cc: Warner Losh , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4610002MZdz47sm X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.46 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-2.28 / 15.00]; ARC_NA(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.991,0]; RCVD_IN_DNSWL_NONE(0.00)[46.210.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.29)[ip: (-0.53), ipnet: 209.85.128.0/17(-3.40), asn: 15169(-2.46), country: US(-0.05)]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; 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)[uqs@freebsd.org,uspoerlein@gmail.com]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" 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: Sat, 03 Aug 2019 10:00:34 -0000 Am Do., 25. Juli 2019 um 16:32 Uhr schrieb Ed Maste : > 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. > We can't really leave it in this state forever, because it's hard to verify that the SVN and the GIT repo are really in sync (well, you just check out head and "diff" the working copy, done, but people re-creating their own copy will see everything differently and freak out). And to be honest, the cvs2svn conversion turned so much of the old history into garbage, that we should either fix them (impossible?) or cut our losses and have the git history end at the point when cvs was switched to svn, at which point the history is sane again. hth Uli From owner-freebsd-git@freebsd.org Sat Aug 3 11:44:37 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 CAEABAF013 for ; Sat, 3 Aug 2019 11:44:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4612J54zyjz4Drn; Sat, 3 Aug 2019 11:44:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [87.251.56.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 73C19824D; Sat, 3 Aug 2019 11:44:37 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:470:7a58::bdc8:6332:8f95:8dc1] (unknown [IPv6:2001:470:7a58:0:bdc8:6332:8f95:8dc1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id C516A7D64; Sat, 3 Aug 2019 13:44:35 +0200 (CEST) From: Dimitry Andric Message-Id: <4F503FF4-1BFD-4A9D-9969-16704456DFB3@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_9093A7B8-6EFC-4B58-802A-02C74880B6B9"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.11\)) Subject: Re: github freebsd and svn freebsd Date: Sat, 3 Aug 2019 13:44:35 +0200 In-Reply-To: Cc: Ed Maste , freebsd-git@freebsd.org To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= References: <18a5abcc-afbc-41c3-75ed-e33607e70c8f@zyxst.net> <20180904105302.GD2118@home.opsec.eu> X-Mailer: Apple Mail (2.3445.104.11) 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: Sat, 03 Aug 2019 11:44:37 -0000 --Apple-Mail=_9093A7B8-6EFC-4B58-802A-02C74880B6B9 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 On 3 Aug 2019, at 12:00, Ulrich Sp=C3=B6rlein wrote: ... > And to be honest, the cvs2svn conversion turned so much of the old = history > into garbage, that we should either fix > them (impossible?) Is there still an archive of the CVS repository itself just before the conversion to Subversion? Maybe that could be imported directly in to Git, and then graft on the Subversion history from there? -Dimitry --Apple-Mail=_9093A7B8-6EFC-4B58-802A-02C74880B6B9 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCXUVzowAKCRCwXqMKLiCW oz1pAKDl8twPWDF0Zgz3hNBsRmn9huCmPwCfTmoIx5ET9syf7PtvL1UHkNi89bY= =3z/d -----END PGP SIGNATURE----- --Apple-Mail=_9093A7B8-6EFC-4B58-802A-02C74880B6B9--