From nobody Thu Mar 07 18:15:46 2024 X-Original-To: freebsd-git@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TrHY06wYGz5DYHP for ; Thu, 7 Mar 2024 18:15:48 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (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 4TrHY0627Vz4SP2; Thu, 7 Mar 2024 18:15:48 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709835348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y69TK9a/L/G4WFyK0kRAR1RrD6a34KXnDaM/wtwioHY=; b=mOXbE1R14v/7GP/k/8T+/M/K4hHs1BXtpvZWUGXDkotssEBGBMPdeJXYuKBvYiMZ9xlWNI qkV5ZXaitLvY26Y0NrY1spyEY8AkbB7iFE66TDoh/40W+77yrW1OfuBhtRBDQw5bv+iqbJ 6eImIvD4mt8SUZFw8NSxUT1TLismtsq1ARaxCnr7WL/2pPL7Bfhuh5QvQvXE+mJa1x8zZj +llW4JjzbA4THRIqwBLGWjeMplw6A6WldUuT3qlrx8T6jSkOhs2buYz0yJNxNorxzvHGkK ieD6hQ2efJtgGJ1vAgf6p0tAYLlCY21pTAaRoh0O/tTvX/FjtHUJMS9zZ70Q5w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709835348; a=rsa-sha256; cv=none; b=pHVWt/WHXXlTDJSMF6jJD7S/C7i9phXYdN/R4hxUlg+f31l+6YQJWVVlxYnEOYeuOAtuue nBJIs/RdtbJ6b21PI07pzQz6iJofWv9zRcM8axUM5oU+yvJHjZX0RvPcoJuvWj7ZcjflnM I0UVNqzWZPvq2yK3h+GnhPpFn/cm4Lfdaegtx9JTP5vWvD6QCErfBPj4cTnbbdXoZURrxh 5UjMLI4EVdiwsmuL0TaiPu0Ij4r4UtVtMr6I8v1S7UL9raQkMTzkUv10oMqp2r+tCEd9NY kvw4Zh1amHQmrRlUEFJCxhaU8Q+wKV+7lfd6hmhOyLBjbHLdHkT4DwZ/dceSbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709835348; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=Y69TK9a/L/G4WFyK0kRAR1RrD6a34KXnDaM/wtwioHY=; b=K/VHqXiKGtJIwMYZDUDGmlsGmBUvlvV5IhaYQvH4v1bq6oGq6Lbt0PpoqLWTr9/z9oOvQq 7TgNvaDVZ7KJFg6E2TtCKDmOZ1EbSOGd3QCy5Jh5sxyiZx/QT1XFvsChGJifv2NkaNexvU CnUIU7JKmXB8Mlsedoq3KaLmxKHtk+yVq5FY61gZRylqIAHotBkAAhdz38Cbc5KvA0v9Up ST3Wbdc+71n40eJMJ647oouxfGB5u2c0kQ4Ef8DRouxqALczl3MrA0cFVh5CMIrJ4/vi6J IPId1WiEGaiHys9VBuFYTu77gQ0SZI7xnB6zTeqdopqSRRxZVo1vNeH7R0LczQ== Received: from cell.glebi.us (glebi.us [162.251.186.162]) (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 did not present a certificate) (Authenticated sender: glebius) by smtp.freebsd.org (Postfix) with ESMTPSA id 4TrHY02FHkz1BvH; Thu, 7 Mar 2024 18:15:48 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Thu, 7 Mar 2024 10:15:46 -0800 From: Gleb Smirnoff To: Warner Losh Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Subject: Re: vendor imports beyond the committers guide? Message-ID: References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> <8n0r562s-non1-5269-p649-2s8rr05op914@serrofq.bet> List-Id: Discussion of git use in the FreeBSD project List-Archive: https://lists.freebsd.org/archives/freebsd-git List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-git@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Thu, Mar 07, 2024 at 10:07:52AM -0800, Warner Losh wrote: W> > yes, it's three or four or five different repos with the full linux W> > kernel in it; nothing you want. And I believe we do not do subtrees W> > in FreeBSD official. W> > W> W> If it is from the Linux Kernel, then I'd just need a directory list and a W> hash. W> W> And we definitely can't do a subtree merge from that repo to ours including W> its entire history. Well, we can do 'subtree split' out of the Linux and then 'subtree add' to us to seed it with full history. After that, for the updates we would do incremental 'subtree split' followed by 'subtree merge'. This all is doable if we really want to. It is up to you if we want to do that or not. -- Gleb Smirnoff