From owner-freebsd-git@freebsd.org Fri Apr 2 18:15:12 2021 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 E3E0457DD84 for ; Fri, 2 Apr 2021 18:15:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (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 4FBpB85jkQz3jDN for ; Fri, 2 Apr 2021 18:15:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2f.google.com with SMTP id j17so2825720qvo.13 for ; Fri, 02 Apr 2021 11:15:12 -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=uASzFalZIOkOMdtP5+MNvBKPoey+I0vn5p5rYG0ixi4=; b=dXe4dyyqC6Pl9xRX6aljg/ecmpcP3NBKMyvWOTsXTx9oTehSyBL9ZCAs3GFXk7N4r8 RJpq5CaSCO31oDpbE4jdU6dHNUC1sTRXeq8DlkK8qrk/K7OyK8lVjcvXJ9Qg75ydRvWK 8C91VWL8IAS6n8ll17yfxkr3GfFqxKAbpyC1xxf9M3+3LLPHptyepJ+f2mpOZciifG3L gwKzyiDul/Y7W2zUxdP0SmivY3D3LcFrwCn8AoUkfs5kzRJTDgXLpSF4HF9Tgbh8cLUQ 3wIwjZ6W+eKtbwzQtI2Hv1o1bE8ghOiudXQqzpi/g5G3IrLd5QiSVEGl2OCBndcI/Uq1 5UOA== 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=uASzFalZIOkOMdtP5+MNvBKPoey+I0vn5p5rYG0ixi4=; b=mfGovZLzXVwqaca0FPQUkIgSONwW07vxNzqopTbjSSrWPfp6PIcSdDfLXT6T8GmNh7 OMCgifLMPVggaAKFhXVc454iYW0NDwdSzvlr6HPzF3BPEdmm7PST/6TPDb+oB9UrTvRD 0EUOrKhUPEw9LXjKmzL30GxJeN0pko6g24rMhK4Ms0ODXCwERTPI+ua4IYhhOfyf3Js+ HpTv1MaK/8E8UGmx6qheBp59mqTLIFvmT3Pl5LJu8sgl+eVXfU09wY7Cmv0oHYrVIFOw 5sRVYxX71HpNzp/g8FjT1RiHEX0WFsd6QfxKjpTNEeP382cn0iPBkZ81j0jYBI56bSxG FsVA== X-Gm-Message-State: AOAM531hlE5DHfxOUtpZOaufTsoo4saJugjiAVmseAqhuQ70L6bYI2RX qxzFi+Sc4GUC5KFzSErblVJGoPq41jpv3FDkGsRWaQ== X-Google-Smtp-Source: ABdhPJwlosaYROZq2P3LHOmxM5nstivkCBG4HJ2d0+SeViHcZhH8nZA3QcsZLpmXiSIJDSK8bN7F5xioN7BxHIkxjJ0= X-Received: by 2002:a05:6214:aae:: with SMTP id ew14mr14122514qvb.24.1617387311835; Fri, 02 Apr 2021 11:15:11 -0700 (PDT) MIME-Version: 1.0 References: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org> In-Reply-To: From: Warner Losh Date: Fri, 2 Apr 2021 12:15:00 -0600 Message-ID: Subject: Re: OpenZFS branch tracking policy To: Ed Maste Cc: Martin Matuska , freebsd-git X-Rspamd-Queue-Id: 4FBpB85jkQz3jDN X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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, 02 Apr 2021 18:15:13 -0000 On Fri, Apr 2, 2021 at 11:56 AM Ed Maste wrote: > On Fri, 2 Apr 2021 at 11:50, Warner Losh wrote: > > > > We'd always hoped that we'd be able to do subtree merges from upstreams > > that use git into FreeBSD. The big worry, though, was that this would > > needless bloat the repo with a lot of history. We don't want, for > example, > > all of LLVM's history in the tree. We'd always anticipated that there'd > be > > some things we'd just accept the history for, since it is similar in > > character to the vendor branches (though of course a bit more). > > Note that if we do want to avoid bringing in the full history `git > subtree merge` supports a `--squash` option. This brings in the set of > upstream changes as a single commit, without bringing along the > associated history. We will need to do more experimentation to confirm > that the full process, including bootstrapping, will work as we want. > Assuming this all works it should allow us to forgo the use of a > FreeBSD-specific vendor branch in src. > > We've discussed mirroring any such 3rd-party source in some > FreeBSD-controlled repository. This would allow the project to retain > a full copy of the history, but avoid bloating src with it. > > I agree with Warner that we may want a different policy (full history > or snapshots) for different contrib sources. > Good points Ed. I'd forgotten about --squash. Martin, what's your timeline for wanting to implement these things? I'm unfamiliar with the OpenZFS schedules. Warner