From owner-freebsd-git@freebsd.org Tue Jun 9 22:48:34 2020 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 781FA33F98A for ; Tue, 9 Jun 2020 22:48:34 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82b.google.com (mail-qt1-x82b.google.com [IPv6:2607:f8b0:4864:20::82b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 49hQJd71TFz3g0N for ; Tue, 9 Jun 2020 22:48:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82b.google.com with SMTP id u17so326196qtq.1 for ; Tue, 09 Jun 2020 15:48:33 -0700 (PDT) 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=6H2KCAHCrkvnuZulBWzNZQ0rST4s1FsUzDvn0O+WqYw=; b=Aab1cIzVIVzar9/PztUq2PfFZ3zVDeFKhp2T2io8nFfgWtSpA9O1P5T/vCNlwq3BaX nUo2N/xEghXfsCTre4MasViCcSmQkryluMCpaCYh2ULWrprvYZflId4x5mvzqcqA41UE 5We/hJnuDtU9yclpm6Kwph0/S8STstJ3Q7xhjPG2UZ1kPwxuQVmfB8pOfgsaP1tSr/Ty AHdeBYHwu1QTQ4W+bCXOUCA6dtMfTsC2B3aoY9pAaiYL1+VWEGl8YszMcuF8So+rmSAS eL2Fo3J8nvjyXu4gPBOPRQza6HggSbGrL5KiNshnfwxExmb2vfAtEKJXThxxG6XVEEDL gFJw== 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=6H2KCAHCrkvnuZulBWzNZQ0rST4s1FsUzDvn0O+WqYw=; b=cZgnA28Svy5djl5CcHxAKSONDUzl2L9wc1bwkzagNXjjaoqaWPf/PtQtRf/u0I5unM O5U5NYQoDgXhQ/pUBMPO88dKP1/Mp/UDaZV+Z1tMblHbmqzNZ9agq4fOlWIuixUItUFH ZrcwX8ToozzJQqWY43o50fWUXVDhJDBkQ7Vd77Xg2RIoYXcxOWvEo/rupKgj9Dt+yaZS nQ46tr+7asQi+E9Yp0b3WmZqwIrTSn2U9tlBpgkPP6/C6gbdhAx2pkeqGtRtPWyEFI9q les679s4EqDhHnt4Tua+PY72MZI1O7yQOyXJYbygAxTuq5NJmuXBOIuegT9dgSeRkE89 ztMw== X-Gm-Message-State: AOAM530AM4skmoWxxJu23bWlOUplvW1BtvmjuogB0ELSLoVRdsI79UZb QWF9uatMDhkKJqyxC+bey6ygfv/qjg5FyglJ8fJlDKpZ X-Google-Smtp-Source: ABdhPJz+KgbtuHVc6S+LRCVEsiaIWPbdd1d2DnepOFY0hVyHT2HCEpalEbrfMp8AycLoIfunM8dGAnzhwIS3l+nkXf8= X-Received: by 2002:ac8:192c:: with SMTP id t41mr240227qtj.32.1591742913130; Tue, 09 Jun 2020 15:48:33 -0700 (PDT) MIME-Version: 1.0 References: <202006092232.059MWWao074759@slippy.cwsent.com> In-Reply-To: <202006092232.059MWWao074759@slippy.cwsent.com> From: Warner Losh Date: Tue, 9 Jun 2020 16:48:22 -0600 Message-ID: Subject: Re: Beta git conversion available for experimentation To: Cy Schubert Cc: Ed Maste , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 49hQJd71TFz3g0N X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Aab1cIzV; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::82b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.39 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-0.96)[-0.955]; 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(-0.89)[-0.888]; 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:+]; NEURAL_HAM_SHORT(-0.55)[-0.547]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::82b:from]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; 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.33 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.33 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, 09 Jun 2020 22:48:34 -0000 On Tue, Jun 9, 2020 at 4:32 PM Cy Schubert wrote: > In message > om> > , Ed Maste writes: > > I'm pleased to share the Git Working Group's beta version of the > > FreeBSD doc, ports, and src repositories. You can browse the > > repositories at: > > > > https://cgit-beta.freebsd.org/ > > > > and the three individual repositories are: > > > > https://cgit-beta.freebsd.org/doc/ > > https://cgit-beta.freebsd.org/ports/ > > https://cgit-beta.freebsd.org/src/ > > > > Compared to the current git mirror repos (on GitHub) Ulrich has put in > > a lot of effort to fix svn2git (svn-all-fast-export) to handle > > mergeinfo and address other issues, so that the git conversion > > correctly represents vendor branch merges, tag operations, etc. This > > work is still ongoing as we work through the long tail of oddities in > > our Subversion history, so a caution is in order: > > > > THE GIT HASHES IN THESE REPOSITORIES WILL CHANGE! > > > > These are for experimental purposes only at this point, and should not > > yet be used for production purposes. > > > > An initial goal is to have maintainers of 3rd party ("contrib") > > software in FreeBSD clone and check the history of their individual > > components, and to start experimenting with managing vendor branches > > in the git model. A lot more detail will be provided in the near > > future, but I wanted to share the repository links so that interested > > parties can start working with these new repos. > > Do we have any doc on managing contrib using the git model? > We're working on our suggested best practices. We're making sure that the early testing we did to come up with the basics can be replicated easily enough for it to be practical. There will be a doc going over all the following in detail, but here's the outline. git subtree allows one to merge in other repos into our main repo w/o users of that repo needing to grab the merged in repos. We plan on making what we call vendor branches today vendor repos. We'd then do a git subtree merge from that repo as it tracks upstream. There's a number of tricky cases to work out and to make sure work before we can write it all up as a chapter in our "freebsd developer git guide" that we'll be producing. Warner