From owner-freebsd-git@freebsd.org Wed Nov 13 16:29:14 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 CCCB81B542B for ; Wed, 13 Nov 2019 16:29:14 +0000 (UTC) (envelope-from ilya@bakulin.de) Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [IPv6:2a00:1450:4864:20::22b]) (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 47CqnP54BKz4Dkc for ; Wed, 13 Nov 2019 16:29:13 +0000 (UTC) (envelope-from ilya@bakulin.de) Received: by mail-lj1-x22b.google.com with SMTP id r7so3304393ljg.2 for ; Wed, 13 Nov 2019 08:29:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bakulin-de.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=EQLl5UByK6r2QUjzOpbKorJPyvCFsXMfz0GLCoq5Le8=; b=KqPtXOhy1kalNhYf04N/BZuE129doeevLU3gyHNTC/3DsMskRb3nSC1ScT7rAL6X2g 6BYJoMtTC+5U7CGVMUFCnx/pEPr+Aoqm/XrupIinvwRLUlX/tN5uC2uaGsQfRXeTl+5D llB9HAq6XZ3bqhWG+no/pVXjL5nd1OEhI5K1OlbdmdfUO84ZMUlfJnZcaOE9V/O3wCSr 632/Dt7fYTSduPz5+jK6v2F7/5fwkO9VUA0rZnxtHpUi6lxmOHlRdsTmo97YimDUWXhl H18Ll9CPWgcdrAkCqzbkY0NlcVXYkDF59g1DTk9qkESSu0PsMk05Eqsb3eGifc7tXWk3 4JIQ== 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=EQLl5UByK6r2QUjzOpbKorJPyvCFsXMfz0GLCoq5Le8=; b=lpRicHVxRNuwnTIcUduZFTj4h8aeCWsg2rvIYU6syhmzjzEqhNxKuGiBfrWRUlFdGu zOWyatZGRAHdimNv5lvPAc4tKDtEdMWTyX/0Zti8tKeE2BOngUh7sRWH3EGySGSR8avD XIhnUDjdkhityRuFUsMyrOEjMShBa4Krc1GxdPtXnQIrs/Yi3TGAz890hTRDJv59TbxA lzzHyKv0CUcmlm07hHtjCpiT9kNsEWyfk/gdyq95d5QyTiIzEtZvuKnjMV+cI2A/4u0u rQ1Vd8nfbqSkcTALWi/zvGDh8ReJyMEh8j0SbrQbgLxModeognQY56Xtm7i8K89Uxiz0 NiQQ== X-Gm-Message-State: APjAAAWxW9UHDiJPX3td7b+lvPYNyJHanGZmUuJCjWenV0+CrIq/Z4I8 TEYNBK/ShYKbsWj2UaVyGuR3O92fj9If9qUaF4qWc1DorWg= X-Google-Smtp-Source: APXvYqyWjLKIeW1eNRZfBNXnpvLdN2c/VdG2gfQpaTmGVNBC5gJULP6K8vIuTWQm0ZTBTX5tR7UhqDA9IVwuMHq2jDk= X-Received: by 2002:a2e:9151:: with SMTP id q17mr3373721ljg.156.1573662550815; Wed, 13 Nov 2019 08:29:10 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ilya Bakulin Date: Wed, 13 Nov 2019 17:28:59 +0100 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Ed Maste Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 47CqnP54BKz4Dkc X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bakulin-de.20150623.gappssmtp.com header.s=20150623 header.b=KqPtXOhy; dmarc=none; spf=none (mx1.freebsd.org: domain of ilya@bakulin.de has no SPF policy when checking 2a00:1450:4864:20::22b) smtp.mailfrom=ilya@bakulin.de X-Spamd-Result: default: False [-4.12 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bakulin-de.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bakulin.de]; URI_COUNT_ODD(1.00)[9]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bakulin-de.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[b.2.2.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.5.4.1.0.0.a.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.82)[ip: (-9.29), ipnet: 2a00:1450::/32(-2.74), asn: 15169(-1.99), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[] 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: Wed, 13 Nov 2019 16:29:14 -0000 So with that new Github feature in mind, if we all move FreeBSD main repo to Github tomorrow, what will break for us? What does Github not give us that we absolutely need? On Tue, Oct 22, 2019 at 6:45 PM Ed Maste wrote: > From the llvm development mailing list: > > > We're getting ready to start migrating to GitHub. SVN will be > > moved to read-only now and we'll > > begin the process of turning on GitHub commit access. > http://lists.llvm.org/pipermail/llvm-dev/2019-October/136106.html > > A few additional points I found in another thread that are probably of > interest to the FreeBSD/git community: > > > Just in the last week, the GitHub team completed the "Require Linear > > History" branch protection, which means we can now enforce linear > > history server side and do not need the git-llvm script to do this. > http://lists.llvm.org/pipermail/llvm-dev/2019-October/135912.html > > and later: > > GitHub only supports pre-receive hooks in their Enterprise Server > edition, > > which isn't a good option for us, because we would need to self-host it. > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Wed Nov 13 18:29: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 6367E1B7B55 for ; Wed, 13 Nov 2019 18:29:37 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf36.google.com (mail-qv1-xf36.google.com [IPv6:2607:f8b0:4864:20::f36]) (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 47CtSJ37Bsz4LyM for ; Wed, 13 Nov 2019 18:29:36 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf36.google.com with SMTP id g12so1212261qvy.12 for ; Wed, 13 Nov 2019 10:29:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=zqjyCexfujqnLcP/lvTM+PHbvYdRRowy6Q/E3htn25Y=; b=h/3bZJGsrH+fzVUvMWGxpqpyOougEVXB9r50pRpfeZUAa3VYTvyOhTdCRPHoxlU6oi kwZaacKogbyfrtQCF4hEIrVU+QWPBV+gXTYtEiCGTmLZ90fjo/+/V/tUbulGEg9vdKSE Pjxuz1SstItCBcgplZOtltH8Q7EVRFh7BM8TH5zFuGNpEl/sbvRPEIbHd1UHLMb5oX/s D324DMxEb7kHVndXQcHXr7GaFqXbgoVT4Hs/CByR0T3bc9QSk3Pbk4JWxFoyFHzokZPv u1XeZ/uBOSPHRF+2GbUjKpLIogCQKAN2WPQpdRcY+OcZ5tIoWv6brWwEtwJAUQr7Bd5R EXhw== 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=zqjyCexfujqnLcP/lvTM+PHbvYdRRowy6Q/E3htn25Y=; b=mDwBWHw7PzrawvRBVMv5bN+EfHkmo0cQVZtl2TVxTgUPO4XtXV+mtdNmUVxpVny0ba 5W9nyRPbpUP/MBxDm42kQ3qjp8SAJj3MVXTgo5MynpnoEs2zNJ0jZzpFCBkRvWrLnmiT jozxqk6/CbG4yisc+g4Kib4oivoQwkPgw41KwtFowtbzbhlKzRgSsIsfAeA4qWzlVK+A bEmHxjepxKX0xD5It9Wat7GqdbB4TMeZ0xkZE0PVVABv4ZHKRECioxlABAI2CtT/kbIG 8rrmUQ5UfkbHVhrl0/9DVPjliy+PUjT1QrjfUNPzCa8zkeknyTCe1fq2HzTYavBgwri+ CfJQ== X-Gm-Message-State: APjAAAVF2CTSpcPMAcsyP+gLN0HOnPYyalIRA+o42wf4KunB8cfEMrUE TYqJjXQeu5yv6OMmYgYsub1RkcxhRA5rrzHbvUWO7jwlRt4= X-Google-Smtp-Source: APXvYqyt4ga1azCABtdcMuXkGvDfgCge6PxcpcW9PQUG7LSpC8nBsSl2SQQAM6wZPK42laEafvcoWZ3vYgspBUrcJOo= X-Received: by 2002:a05:6214:170c:: with SMTP id db12mr4202801qvb.202.1573669770026; Wed, 13 Nov 2019 10:29:30 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 13 Nov 2019 11:29:19 -0700 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Ilya Bakulin Cc: Ed Maste , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 47CtSJ37Bsz4LyM X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=h/3bZJGs; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f36) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.87 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-0.87)[ipnet: 2607:f8b0::/32(-2.33), asn: 15169(-1.99), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; 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: Wed, 13 Nov 2019 18:29:37 -0000 Vendor branches break. Our work flow breaks. Some committers have "terms of service" wrt de-platforming. The release engineer won't be able to build releases due to SVN integration. Just moving to github is non-starter at the moment. It won't happen without careful planning. Planning that's on going at the moment. LLVM didn't "just move to github" either. They had a significant transition period. We are studying their move to speed our transition to git. Warner On Wed, Nov 13, 2019 at 9:29 AM Ilya Bakulin wrote: > So with that new Github feature in mind, if we all move FreeBSD main repo > to Github tomorrow, what will break for us? > What does Github not give us that we absolutely need? > > On Tue, Oct 22, 2019 at 6:45 PM Ed Maste wrote: > > > From the llvm development mailing list: > > > > > We're getting ready to start migrating to GitHub. SVN will be > > > moved to read-only now and we'll > > > begin the process of turning on GitHub commit access. > > http://lists.llvm.org/pipermail/llvm-dev/2019-October/136106.html > > > > A few additional points I found in another thread that are probably of > > interest to the FreeBSD/git community: > > > > > Just in the last week, the GitHub team completed the "Require Linear > > > History" branch protection, which means we can now enforce linear > > > history server side and do not need the git-llvm script to do this. > > http://lists.llvm.org/pipermail/llvm-dev/2019-October/135912.html > > > > and later: > > > GitHub only supports pre-receive hooks in their Enterprise Server > > edition, > > > which isn't a good option for us, because we would need to self-host > it. > > _______________________________________________ > > freebsd-git@freebsd.org mailing list > > https://lists.freebsd.org/mailman/listinfo/freebsd-git > > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > > > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Wed Nov 13 19:38:40 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 F0BEB1B9829 for ; Wed, 13 Nov 2019 19:38:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from springbank.echomania.com (springbank.echomania.com [IPv6:2a01:7c8:aab2:81::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "springbank.echomania.com", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47Cw0039FLz4ck9 for ; Wed, 13 Nov 2019 19:38:40 +0000 (UTC) (envelope-from dim@FreeBSD.org) X-Virus-Scanned: Debian amavisd-new at springbank.echomania.com Received: from [IPv6:2001:470:7a58:0:9cf:6f1f:fa:40dc] (unknown [IPv6:2001:470:7a58:0:9cf:6f1f:fa:40dc]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by springbank.echomania.com (Postfix) with ESMTPSA id C4EE958019B; Wed, 13 Nov 2019 20:38:30 +0100 (CET) Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Warner Losh , Ilya Bakulin Cc: freebsd-git@freebsd.org References: From: Dimitry Andric Message-ID: <35a9c9f9-ee24-6172-6109-0cd4df5a79e8@FreeBSD.org> Date: Wed, 13 Nov 2019 20:38:30 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:68.0) Gecko/20100101 Thunderbird/68.2.2 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 47Cw0039FLz4ck9 X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-1.92 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-0.92)[-0.918,0]; ASN(0.00)[asn:20857, ipnet:2a01:7c8::/32, country:NL]; NEURAL_HAM_LONG(-1.00)[-1.000,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: Wed, 13 Nov 2019 19:38:41 -0000 The main reason the LLVM project/foundation moved to GitHub is that they rather sucked at hosting their own infrastructure, and that was mainly caused by it not being one of their goals. Now they are also moving in the direction of moving the whole lot to GitHub, including issue tracking and reviewing. Bugzilla has many more features than GitHub's rather anemic issue tracker, but it is extremely dated software, and is considered user-hostile (or should I say millenial-hostile? :) these days. So most people on the LLVM lists appear to be in favor of moving to the GitHub issue tracker. For reviews they use Phabricator like we do, but in that area is less consensus, as many people feel GitHub's pull request model is inferior to Phabricator's review workflow. I guess it mostly depends on your preferences, and the complexity of your reviews. Having said all that, my personal opinion is that it is not wise to outsource all your crown jewels to some commercial closed source party. GitHub may look pretty, and be very fashionable with the Cool Kids, but there have been some instances of censorship, bad decisions, etc. And they could close down your project at any time, for any reason, if they feel like it. -Dimitry P.S.: Yes, I'm also on GitHub, and I signed away my soul to Microsoft. Multiple times, even! On 2019-11-13 19:29, Warner Losh wrote: > Vendor branches break. Our work flow breaks. Some committers have "terms of > service" wrt de-platforming. The release engineer won't be able to build > releases due to SVN integration. Just moving to github is non-starter at > the moment. It won't happen without careful planning. Planning that's on > going at the moment. > > LLVM didn't "just move to github" either. They had a significant transition > period. We are studying their move to speed our transition to git. > > Warner > > On Wed, Nov 13, 2019 at 9:29 AM Ilya Bakulin wrote: > >> So with that new Github feature in mind, if we all move FreeBSD main repo >> to Github tomorrow, what will break for us? >> What does Github not give us that we absolutely need? >> >> On Tue, Oct 22, 2019 at 6:45 PM Ed Maste wrote: >> >>> From the llvm development mailing list: >>> >>>> We're getting ready to start migrating to GitHub. SVN will be >>>> moved to read-only now and we'll >>>> begin the process of turning on GitHub commit access. >>> http://lists.llvm.org/pipermail/llvm-dev/2019-October/136106.html >>> >>> A few additional points I found in another thread that are probably of >>> interest to the FreeBSD/git community: >>> >>>> Just in the last week, the GitHub team completed the "Require Linear >>>> History" branch protection, which means we can now enforce linear >>>> history server side and do not need the git-llvm script to do this. >>> http://lists.llvm.org/pipermail/llvm-dev/2019-October/135912.html >>> >>> and later: >>>> GitHub only supports pre-receive hooks in their Enterprise Server >>> edition, >>>> which isn't a good option for us, because we would need to self-host >> it. >>> _______________________________________________ >>> freebsd-git@freebsd.org mailing list >>> https://lists.freebsd.org/mailman/listinfo/freebsd-git >>> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >>> >> _______________________________________________ >> freebsd-git@freebsd.org mailing list >> https://lists.freebsd.org/mailman/listinfo/freebsd-git >> To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" >> > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Thu Nov 14 19:39: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 249ED1B1742 for ; Thu, 14 Nov 2019 19:39:27 +0000 (UTC) (envelope-from delphij@gmail.com) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (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 47DWyP62cbz47JF for ; Thu, 14 Nov 2019 19:39:25 +0000 (UTC) (envelope-from delphij@gmail.com) Received: by mail-oi1-x233.google.com with SMTP id m193so6416802oig.0 for ; Thu, 14 Nov 2019 11:39:25 -0800 (PST) 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; bh=CjCnZLEiEeVIVTzLmiQvK0yhtyMDOw+P1E2bUDOdtMw=; b=OT0opxVXZHk2vGaCYiVDeAwBQaC8VwgtONY9tMitqn2Uri1N5EQbtWVsQaC8QLjJOp LhD8Vodov/jm8VwHQttGEbDq5dRZIcr1BUu6pbUQDisvWWmjKYFhbpUhCyjsYLxo+DlQ XMA04k6Fc37Vll7tUpmDe8oFIRjGJENCFTgdVgVCqcveSmG3tu927FFWOnHquuBFKbtr O22rLwmmgYbxcn2zgw0foMh+5YP8aGqB6DjHY7olgHmOvejtXS007CEq9+mOqke9Vk6p yF+Qvm7cE3BXiUSUytmwvUn2eQCP8G4fVoUs2rKSekIwh+xZmuGbLyFQJU4V110JY3yK N1Jg== 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=CjCnZLEiEeVIVTzLmiQvK0yhtyMDOw+P1E2bUDOdtMw=; b=coczGCkf411ygZImFWXrpqsVWMHNpQzdtVmzC8aLFn6dirlVi6BYaZ42xdNp+uaQzc hop1bJeep+4DZQ6uZakOz+QmLHTcT/nyh5GndIh7jTbH8lmVI5X/uMeyf1Hbbez0p4sT RdEvVTnyxcK67hqc4SyAvWK8r5lbp27MHy0uXTGK9SuX4jyXttdyHBCLRBFftY1p3yRo eL15poJC0zKAc2IvOsQZzRCf+mbOpPbajRn2iiE3x8AvGnjcyIUuh+uYoPh+WFTwPPLt 3yt2Y7LBoHXGVZFV/kL4l1SvI7UxOWLu7OEeqmN7K0KSR2iZ3zLTlqv5lXvT/Qr9gLaB aaPg== X-Gm-Message-State: APjAAAXwq8P9UChU8FvqHfwFg4SaVaL6rEQurLnjmiRrz+VgsSPRqOis SagYyQ262adyVcSFXksnArWlKqeaNTougHKxjIE= X-Google-Smtp-Source: APXvYqzMEUaw0vLlJpK2aG6BMpRLrZEiJFngNgU/QVZS2tT8/CjjB0eJf7QS1K6e+YP/wOGBV8Gtfqn1IDAOuiW4+H0= X-Received: by 2002:a05:6808:6c3:: with SMTP id m3mr5264305oih.56.1573760363835; Thu, 14 Nov 2019 11:39:23 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Xin LI Date: Thu, 14 Nov 2019 11:39:12 -0800 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Warner Losh Cc: Ilya Bakulin , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 47DWyP62cbz47JF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=OT0opxVX; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of delphij@gmail.com designates 2607:f8b0:4864:20::233 as permitted sender) smtp.mailfrom=delphij@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:c]; FREEMAIL_FROM(0.00)[gmail.com]; MIME_GOOD(-0.10)[multipart/alternative,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)[3.3.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: (-8.15), ipnet: 2607:f8b0::/32(-2.32), asn: 15169(-1.99), country: US(-0.05)]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; 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] 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: Thu, 14 Nov 2019 19:39:27 -0000 On Wed, Nov 13, 2019 at 10:29 AM Warner Losh wrote: > Vendor branches break. > Speaking for this, I have took contrib/file as an opportunity to try out how git merge works in FreeBSD's context (without using submodules). Basically we would have the github.com/file/file histories stashed into one branch, and perform two merges. The first one would "bootstrap" the history, by performing a git merge with -s ours of the previously merged tag. This would require some cleanups: the upstream's CVS exporter was broken and some RCS IDs were not correctly updated, so technically one would have to patch the contrib/file tree to bring the git's vision of RCS IDs, then perform a merge -X subtree merge. The second one would be the actual merge (-X subtree=contrib/file). Future imports would only need this merge. If the upstream was not using git, these could be pushed to a different branch to hold it (which is pretty much what we do in subversion in its flattened namespace under vendor/foo/dist). From owner-freebsd-git@freebsd.org Fri Nov 15 00:20:18 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 821AB1B6EF9 for ; Fri, 15 Nov 2019 00:20:18 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 47DfBS4hGtz4NN4 for ; Fri, 15 Nov 2019 00:20:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x733.google.com with SMTP id 71so6740814qkl.0 for ; Thu, 14 Nov 2019 16:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=7WCfXsGnnhKfF6fFegQQcQbf8q04TxGNrj15BbuqAdk=; b=jwhux5FhvQSi5/M6NzuTCFPLaKKOA0UOdBj7fLdxfqc1h5JZeMMcmiTAzc9jdCOmcf QFbuCiD9EgarZWtXBGvozukUeH6hRPAU+ufzZnFQnqbtyiKitReqMN/pQzoNBqlsBgRD vz/M8J81cikK00/ZMsgsRpgIeS5OFC2/8QF57oc+1z8fwPJxlA5qM1BrBlOguslGe4h/ 6O7qLdNEhAT+UTfrQm3BeJu3n2XFDHiBpqmxkhad0W2JA89DZuxah8IrDp1AX/MjJChu gzbOKVfQP04ioo5bFS7Rbg+8DG4nIG5pAqC3Ox2F/WT4TRwKF75iKumcJhBUIC5tZGtu CxLg== 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=7WCfXsGnnhKfF6fFegQQcQbf8q04TxGNrj15BbuqAdk=; b=f+TGFbvh10DuLefhRzmkQzbLeJqQu9LKbVgwd4kZqvjnJLhgBktd7gLe4Wuq0DTpcS ni8gDbKXcqwW7WTkfRyEXKYXT/RyNZmBgz39xt4ajtVZeUh/zcIvkEW4vI7enU3hcEvG 9U3dZvWETBGxWtV1Wg+tzSH9/0+dj1Ny50uLHnz16GhO1/fshkJ90+3f6F72mwClF8po notOijIdBEU2Gw7y4UgAevOjQHzpBTfELPtUe05PAUTj4kgGjJdMnC3VhaQoMZd/yg+l PPAF2pbpx4j02tV/jLPcv0lvE42RbAO7/gXmtXjztoydEYZVLMMxmhtipwRNF2kDlPZY E7Cg== X-Gm-Message-State: APjAAAViXpKwiLPOJ+/xZl8LBPX8b4snRmEJwdX8dg0RfmJYepy7G39S Mt5CTUZF+A8zGeTZAmdyOaE41EH95QrHFIIv/nUbWQ== X-Google-Smtp-Source: APXvYqzxMsYusPa102j27lMqwiyJsbJxC+n85ozFOy/8u26mQrwnTHVFq94P2CO08M53xkC3e+ioZ7vNa1ulkrR8Ik0= X-Received: by 2002:a37:4716:: with SMTP id u22mr10181070qka.495.1573777214989; Thu, 14 Nov 2019 16:20:14 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Thu, 14 Nov 2019 17:20:04 -0700 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Xin LI Cc: Ilya Bakulin , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 47DfBS4hGtz4NN4 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=jwhux5Fh; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::733) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.72 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[3.3.7.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]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; FREEMAIL_TO(0.00)[gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.72)[ip: (-9.25), ipnet: 2607:f8b0::/32(-2.32), asn: 15169(-1.99), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; 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: Fri, 15 Nov 2019 00:20:18 -0000 On Thu, Nov 14, 2019 at 12:39 PM Xin LI wrote: > > On Wed, Nov 13, 2019 at 10:29 AM Warner Losh wrote: > >> Vendor branches break. >> > > Speaking for this, I have took contrib/file as an opportunity to try out > how git merge works in FreeBSD's context (without using submodules). > Basically we would have the github.com/file/file histories stashed into > one branch, and perform two merges. > > The first one would "bootstrap" the history, by performing a git merge > with -s ours of the previously merged tag. This would require some > cleanups: the upstream's CVS exporter was broken and some RCS IDs were not > correctly updated, so technically one would have to patch the contrib/file > tree to bring the git's vision of RCS IDs, then perform a merge -X subtree > merge. > > The second one would be the actual merge (-X subtree=contrib/file). > Future imports would only need this merge. > > If the upstream was not using git, these could be pushed to a different > branch to hold it (which is pretty much what we do in subversion in its > flattened namespace under vendor/foo/dist). > Do you have the results of this published somewhere? In looking into submodules, I couldn't figure out how to layer changes on top of the submodule in any way that was approaching sane... If we used the code verbatim, as is in the upstream repo, it might be OK, but it looks like it's intended to solve different problems than our 'vendor branch' issue. Warner From owner-freebsd-git@freebsd.org Fri Nov 15 00:41:52 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 47D0D1B76CA for ; Fri, 15 Nov 2019 00:41:52 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 47DfgM0rkNz3GNY for ; Fri, 15 Nov 2019 00:41:50 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f171.google.com with SMTP id s5so7380026iln.4 for ; Thu, 14 Nov 2019 16:41:50 -0800 (PST) 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=17cGCM0bSIP6fHQ4hZAfGYXYvM4NgtAnMkgFkgvJM0A=; b=RJO98SAMDdJogOTxFHVhJwMHpH8cmXZ3xxy9+YuzOsF/wARH/Z4Mai9sbyLVzbRCdC Mx0hL3daNa62Pzl0Gaz98kLc41yTJrQvsuH11d4lbwjF+zEnvfi2PNRYUfLW3wu07PvD 31SDqKuye68NH8Xwygmn7i7vp++F4L7WBTU0+v3ZVkn6M6O8XvGzV7QsrZCZMkD6x5m1 Ap5Dfci099MY4NQI2EBTBgu+R9iHipsZWJIjn8hmG62QDansPdHqM556WJlvV1WqlRfL IyXC0VeVZ15zaJ3V+lHX5aG93T4cSkdmzICJYef++7Cnt4oevxeM0bOj4EiEpfdmhAkJ Izaw== X-Gm-Message-State: APjAAAUkDA8pXEszgYu3UcpcGvWk+eVu4e9ldowJVtDJLZrOk06nDLcC qCvVY/ZTU8Px38WOIdta7+4ilHflZFon43I0Akc= X-Google-Smtp-Source: APXvYqwClpfW1/f4/TN6OzqqntyyAU/Sbr7mZNVPh4/Y9u22W84eL3rSIDEkEWpkig+OrfAZFA+fsRIHwg1BqOoNr6E= X-Received: by 2002:a6b:b511:: with SMTP id e17mr10709960iof.18.1573778509696; Thu, 14 Nov 2019 16:41:49 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 14 Nov 2019 15:55:08 -0500 Message-ID: Subject: Re: FYI - LLVM migration to Git and GitHub has started To: Warner Losh Cc: Xin LI , freebsd-git@freebsd.org, Ilya Bakulin Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 47DfgM0rkNz3GNY 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.166.171 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.23 / 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)[4]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; 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)[171.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.23)[ip: (-5.93), ipnet: 209.85.128.0/17(-3.18), asn: 15169(-1.99), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[171.166.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: Fri, 15 Nov 2019 00:41:52 -0000 On Thu, 14 Nov 2019 at 19:20, Warner Losh wrote: > > In looking into submodules, I couldn't figure out how to layer changes on > top of the submodule in any way that was approaching sane... If we used the > code verbatim, as is in the upstream repo, it might be OK, but it looks > like it's intended to solve different problems than our 'vendor branch' > issue. Yes, I'm quite convinced we don't want submodules. Even if we're not modifying the code dealing with submodule updates is just a constant annoyance. I believe `git subtree` can form a workable replacement for the way we approach vendor branches.