From owner-freebsd-git@freebsd.org Fri Apr 23 00:51:06 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 111EF623A63 for ; Fri, 23 Apr 2021 00:51:06 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (mail.vx.sk [IPv6:2a01:4f8:191:9029::4]) by mx1.freebsd.org (Postfix) with ESMTP id 4FRG1j5JM5z3F2F for ; Fri, 23 Apr 2021 00:51:05 +0000 (UTC) (envelope-from mm@FreeBSD.org) Received: from mail.vx.sk (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id 6AA3313A85A; Fri, 23 Apr 2021 02:50:58 +0200 (CEST) X-Virus-Scanned: amavisd-new at mail.vx.sk Received: from mail.vx.sk by mail.vx.sk (amavisd-new, unix socket) with LMTP id k9l6tvDs8Ldz; Fri, 23 Apr 2021 02:50:58 +0200 (CEST) Received: from [10.0.7.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78]) by mail.vx.sk (Postfix) with ESMTPSA id 1DCD213A855; Fri, 23 Apr 2021 02:50:58 +0200 (CEST) To: Warner Losh , freebsd-git References: From: Martin Matuska Subject: Re: OpenZFS imports, status update Message-ID: Date: Fri, 23 Apr 2021 02:50:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.8.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Content-Language: en-US X-Rspamd-Queue-Id: 4FRG1j5JM5z3F2F X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:24940, ipnet:2a01:4f8::/32, country:DE]; local_wl_from(0.00)[FreeBSD.org] 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, 23 Apr 2021 00:51:06 -0000 Hi Warner, thank you very much for the update. If I understand this correctly, the way to go in the future is a 1:1=20 merge from openzfs/master to e.g. vendor/openzfs/master and from=20 openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a=20 second step a subtree merge from vendor/openzfs/* to main or stable/13? Martin On 22. 4. 2021 20:34, Warner Losh wrote: > Hey Martin, > > I just wanted to let you know we've been working towards enabling=20 > pushing vendor/openzfs/* branches. There's one big issue that needs to = > be corrected. Currently, we'll do one email per revision hash on such=20 > imports, so openzfs would generate ~10k emails, which would be=20 > undesirable. Li Wen is working on enabling one email per push for=20 > vendor/* which would eliminate this problem. We hope to be doing test=20 > pushes to the testing repo early=C2=A0next week, and if all goes well=20 > enabling this in production shortly after. > > IMHO, you've made a compelling case: the size is small, the coupling=20 > between the projects is tight and we get some extra benefit from=20 > having a finer-grained vendor branch that we import from. The plan to=20 > import directly from vendor/openzfs/zfs-2.1 would normally be=20 > concerning because it's not following the usual main -> stable/X=20 > workflow. In this case, though, since upstream follows that workflow=20 > we won't lose things that get pushed to stable/13 that aren't also=20 > relevant to main. There's at least some configuration needed to allow=20 > the merge commits to stable/13, but we're still working out the last=20 > details. > > So we'll be good to go soon (1-2 weeks until you can land commits, I=20 > think). Does that work for you? > > Warner >