From nobody Thu Mar 07 17:58:15 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 4TrH8q19MBz5DX6J for ; Thu, 7 Mar 2024 17:58:19 +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 4TrH8q0jCZz4PnL; Thu, 7 Mar 2024 17:58:19 +0000 (UTC) (envelope-from glebius@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709834299; 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=vsQjuTZUIoeS1IrKY57vtDac162pKFzSKlKsVZ64uX8=; b=kYXq0L0E8gr3Dz27cMEyG0mq7Gvvg7fDTpG/WBzs1rBjTmlxMbFUwmd/65Mx9zbUWdAmWm wqrOHestq8woC72nOmj3mq8vIs+l64FUEa9doUOkSnGRqcHs4U+K53qX5pkfFPzyuPZHwo y2FHWr8kIDIe6MvcubNT5nhFT4qOwlHQyCF+LjosLe6hF1VbcKccTn2PqSDSfzghJFLkRu 7ZJ7DX3I76tgWfoRNVZKjf4ZAIPu7VIgndib2Y8eWO8DefBBGALH4d7PsdoNExHFZp7Cez 4NpKILLZl9WNX17+8rFG/60GXHM8kWVcQm/jzIhuIAKDprFO+HT1UXejIaMapQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709834299; a=rsa-sha256; cv=none; b=uAo9f0TxN/U7MJHdc2arBHZu4rz/dHjMxqNTZQhGk1s6A+qsLhzMgEE7N1TUessNLZ1KSg 81v59ATcRiWOuiF2sFStaLXH9NU5P2ExdvoVJWNyrybQG/FYKDwVHUHizweH1LSOV7T/gN XAzmf5TypB1NvCvItk9H+FVs5tvqLuhJ2V+i3hSGEjZf9q8OFijoWS83aaeLXtL/K+Iyod rmDX+BTS1l1Twa3MuHpGDddc92K1eyu7+n+vmvJXD1W69o6hDUkCRG19e3Ioiw8u+YuQda R76eAVCScQykU4ZJYdXQcBkpgGQru92/QkXjEDZWwOMj7xCKbv4AVKjiN8DoSQ== 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=1709834299; 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=vsQjuTZUIoeS1IrKY57vtDac162pKFzSKlKsVZ64uX8=; b=A3i4d+Wp/yuf5PQJX2rpi8uEJvhNxRTFfA75XW2HMyNTPqOx0JtnMkVmCw42+bCBnqGl3J dvAloPQEIhpY6HYJnsXUC5uwmHdqmbt3aCcmyeWDWmiCzb9FNMYhaM7qTbUEN0DTW7mhQP qJf+IanvHGGV7izUOVQ69LOEZV+PLpXeRM0qR6C/9nwsHEURbhgjZwmTt5AkIK0L7pjcTB rmLFvuzlcK6ug85+fZIcBtt9t3ObK+Kl2ijf04mbCyc4DC6HhE6X8bEz32fshQIZw3qsCm nKn4kSlzfao7EiD5EBBAfgqususKHbvr/y3+6HBLcA97p8+4kMXsTjuPA/CzqA== 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 4TrH8p4D75z1Bv2; Thu, 7 Mar 2024 17:58:18 +0000 (UTC) (envelope-from glebius@freebsd.org) Date: Thu, 7 Mar 2024 09:58:15 -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> 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 Wed, Mar 06, 2024 at 03:51:11PM -0800, Warner Losh wrote: W> If we imported each of the versions (exclusive of the cherry-picks). in W> order and W> then merged, this would give us a better history. The commit messages of W> the old W> versions could include the hash where it was committed to the tree's main W> branch. W> This might be wise, since it would allow us to add these links in the W> future if that W> functionality is added to git (or someone cures me of my ignorance). I W> think that W> if these versions were trivial to get, we should do it. If they are a W> hassle, then we W> can forego them. The possible future benefit is speculative at best, so if W> there's W> more than a tiny amount of hassle, we should skip doing each version. Well, if the upstream is a true git repo, then we don't need to care about versions, we can take it with full history as 'subtree add'. Then, replay our commits on top. The downside is that each file will have two histories, and it would require some effort when you call git log to get the correct one. The repo bloat will not be large as the objects would be the same, it would be only extra commits metadatas. This all will look like a small version of what we have at Netflix, where we followed unofficial FreeBSD git repo and then switched to the official one. In practice it seems to work well, although a perfectionists would not like doubled commits deep in the past. Bjoern, can you please point me at upstream source of truth? Is it a repo, or what is it. -- Gleb Smirnoff