From owner-freebsd-git@freebsd.org  Fri Apr  2 10:02:18 2021
Return-Path: <owner-freebsd-git@freebsd.org>
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 4AD715CA590
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Fri,  2 Apr 2021 10:02:18 +0000 (UTC) (envelope-from mm@FreeBSD.org)
Received: from mail.vx.sk (mail.vx.sk [144.76.20.103])
 by mx1.freebsd.org (Postfix) with ESMTP id 4FBbFP6pl9z4f4c
 for <freebsd-git@FreeBSD.org>; Fri,  2 Apr 2021 10:02:16 +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 C7FB01E738D
 for <freebsd-git@FreeBSD.org>; Fri,  2 Apr 2021 12:02:05 +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 kCrcvoHUu1NZ for <freebsd-git@freebsd.org>;
 Fri,  2 Apr 2021 12:02:05 +0200 (CEST)
Received: from [10.9.8.122] (188-167-101-78.dynamic.chello.sk [188.167.101.78])
 by mail.vx.sk (Postfix) with ESMTPSA id 9944A1E7411
 for <freebsd-git@FreeBSD.org>; Fri,  2 Apr 2021 12:02:05 +0200 (CEST)
To: freebsd-git@FreeBSD.org
From: Martin Matuska <mm@FreeBSD.org>
Subject: OpenZFS branch tracking policy
Message-ID: <21c7313e-315c-ec48-9437-e0a3d4ec14d2@FreeBSD.org>
Date: Fri, 2 Apr 2021 12:02:05 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101
 Thunderbird/78.7.1
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: quoted-printable
Content-Language: en-US
X-Rspamd-Queue-Id: 4FBbFP6pl9z4f4c
X-Spamd-Bar: /
Authentication-Results: mx1.freebsd.org;
	none
X-Spamd-Result: default: False [0.00 / 15.00];
 ASN(0.00)[asn:24940, ipnet:144.76.0.0/16, 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 <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Apr 2021 10:02:18 -0000

Dear git working group,

OpenZFS 2.1 is approaching and there is an ongoing discussion between=20
the ZFS developers regarding branch tracking.

What we want archieve:

FreeBSD main will be tracking the master branch of openzfs/zfs
FreeBSD stable/13 will be tracking the zfs-2.1-release and upcoming=20
staging branches of openzfs/zfs (they always have continuous commits)

At the moment, I rsync changes from openzfs/zfs to our vendor/openfzfs=20
and commit them.

The question is, if this is the correct way to do this?
OpenZFS uses git so we might skip vendor/openzfs and subtree merge=20
directly from openzfs/master (and that way inherit all OpenZFS history)=20
and openzfs/zfs-2.1-release. That would be way easier to manage and we=20
can track and see "real" commits from OpenZFS.

The other way would be like now, keep two vendor branches and rsync, but =

that makes it harder to track.

I would be really happy for a decision so I can start merging=20
zfs-2.1-release.

Best regards,
mm