From owner-freebsd-git@freebsd.org Fri Apr 23 20:24:50 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 BEA3D5FE4A8 for ; Fri, 23 Apr 2021 20:24:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FRm4254jBz3JRm; Fri, 23 Apr 2021 20:24:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: uqs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 55A4C219DC; Fri, 23 Apr 2021 20:24:50 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Fri, 23 Apr 2021 22:24:47 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Martin Matuska Cc: Warner Losh , freebsd-git Subject: Re: OpenZFS imports, status update Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) 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 20:24:50 -0000 Wouldn't vendor/openzfs/master simply be an alias for openzfs/master and it would be the pristine upstream source repo? Or do we have local modifications in our vendor/openzfs/master, if so, ignore me. On Fri, 2021-04-23 at 02:50:57 +0200, Martin Matuska wrote: >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 >merge from openzfs/master to e.g. vendor/openzfs/master and from >openzfs/zfs-2.1-release to vendor/openzfs/zfs-2.1-release? And as a >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 >> 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 >> imports, so openzfs would generate ~10k emails, which would be >> undesirable. Li Wen is working on enabling one email per push for >> vendor/* which would eliminate this problem. We hope to be doing test >> pushes to the testing repo early next week, and if all goes well >> enabling this in production shortly after. >> >> IMHO, you've made a compelling case: the size is small, the coupling >> between the projects is tight and we get some extra benefit from >> having a finer-grained vendor branch that we import from. The plan to >> import directly from vendor/openzfs/zfs-2.1 would normally be >> concerning because it's not following the usual main -> stable/X >> workflow. In this case, though, since upstream follows that workflow >> we won't lose things that get pushed to stable/13 that aren't also >> relevant to main. There's at least some configuration needed to allow >> the merge commits to stable/13, but we're still working out the last >> details. >> >> So we'll be good to go soon (1-2 weeks until you can land commits, I >> think). Does that work for you? >> >> Warner >> > >_______________________________________________ >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"