From nobody Thu Mar 7 18:04:53 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 4TrHJg15S2z5DXBn for ; Thu, 7 Mar 2024 18:05:07 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x62b.google.com (mail-ej1-x62b.google.com [IPv6:2a00:1450:4864:20::62b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TrHJf4fHBz4QbV for ; Thu, 7 Mar 2024 18:05:06 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a4467d570cdso5166b.3 for ; Thu, 07 Mar 2024 10:05:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709834705; x=1710439505; darn=freebsd.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=uZxRUKHDMkD4tHJH2ywH3yYHQXdcfYe9QYj4IfpFZeE=; b=fIR5H/9/1kWb4ANTAT3h8dT3q7XIhUbFGbttf1xeVoeg4ZjvjKI1uPzM8yltUS3zI4 SkbOBbRGWVGCX2bP+2k8OqXxnC40TQ6waR7bpGURbX1stir4upR/x7ezJlYVYepYuI6k tlQ2h6YRYVJqBhsXkZZMcA5egYIgNdus9zV1pqKInPZwNyIfZqEwl/vSMdQsiS1t4+1/ 8ci3lIg/oeiYHex/E95IVWb7xJNBRaxHZvf0lisa62cpX2n0OOA9CveJJN3WeZ8+r5OD Kw835DOjuPG8H6fol9E5qgeZKYU7/4krQC3Ji5ytLjCECdjzO6IN2Cnog+vy9v8b07/F yEpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709834705; x=1710439505; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=uZxRUKHDMkD4tHJH2ywH3yYHQXdcfYe9QYj4IfpFZeE=; b=vauliGqGSU8BRGMm9dEM6dqCRBQS/wHtLuQv9Vi1SUuSpEayj6b8P7AMhkWEUcCroY Bu+mzC3SyjgLwrBNKgCagV01Zsb+UnsC+JfKCLzMyWiL5O30FzE3aP1z6ZrUiupzdaVB 4D1rc/cc6q5yiUL5Lf4aKi+ZNTBYoRyfAoLgcFmPiUd+UlnlECs9lhStxod49CMaboP5 IFJd638Pg/4N/WxWZnOeEu5vPTFsMJkWEB4rRwAdMK4elTMdAHG6RbYm0XD+vBWinyjH FBam9MxMLMOwGYU4w7+KunyU7h4T0npKjcjyDzfBgKyARG49t9gsjKRtVx8jvNG1jFu0 O0iA== X-Forwarded-Encrypted: i=1; AJvYcCWTNawCOmBPz1vAV3POYhU19KKzyHWhxj0UOHmphs4cUFd4VoDbkOHthwGJASJiYZjZcHpb0lDUQXvxp7icuBxhxwt1HZ9bhA== X-Gm-Message-State: AOJu0Yx5s7dEM1uHEd+sBVg7Ya85JYdIIfcxLVM/vP3kA0pKjxxIdabh KBn5E1w4AuNX6dgruSvT0/Ay94m4sATFnG752wLAaryHlrg+jok1M6qC1Jg69YLG/msSA9QBIzt BxXTfADED+J/3pwgmmmoLJ9vB9UpYC2YEta6Kng== X-Google-Smtp-Source: AGHT+IGwcVX/NQhZuDeTc8cn/bsWR5aLpKKozF/EbpQ1oFymzNVKt/UWQ1Uo9By6tNgt6X3Qk/o/EaaZo9IT+sa/0rQ= X-Received: by 2002:a17:906:cf88:b0:a45:373:cff with SMTP id um8-20020a170906cf8800b00a4503730cffmr10220392ejb.68.1709834705074; Thu, 07 Mar 2024 10:05:05 -0800 (PST) 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 References: <5pps4nrs-or51-9018-sqp4-7q69s4780r61@serrofq.bet> In-Reply-To: From: Warner Losh Date: Thu, 7 Mar 2024 10:04:53 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: Gleb Smirnoff Cc: "Bjoern A. Zeeb" , freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="00000000000038985e061315ea25" X-Spamd-Bar: ---- X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Queue-Id: 4TrHJf4fHBz4QbV --00000000000038985e061315ea25 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 7, 2024 at 9:58=E2=80=AFAM Gleb Smirnoff = wrote: > 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). i= n > 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, s= o > 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. > It's for the downsides that we don't do this in the FreeBSD tree except for zfs. And even there it causes problems with bisecting. > 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. > It also would bloat the cloned FreeBSD repo. We already have enough bloat there w/o unduly adding to it. > Bjoern, can you please point me at upstream source of truth? > Is it a repo, or what is it. > I'd rather we just import the couple of versions we have in the tree. While the full history might theoretically be useful, I don't think it is warranted in this case. Warner --00000000000038985e061315ea25 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Thu, Mar 7, 2024 at 9:58=E2=80=AFA= M Gleb Smirnoff <glebius@freebsd.= org> wrote:
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= 9;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'.<= br> 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.

It's for the downsides that we don= 9;t do this in the FreeBSD tree except for
zfs. And even there it= causes problems with bisecting.
=C2=A0
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.

It also would bloat the cloned FreeBSD repo. We al= ready have
enough bloat there w/o unduly=C2=A0adding to it.
=
=C2=A0
Bjoern, can you please point me at upstream source of truth?
Is it a repo, or what is it.

I'd ra= ther we just import the couple of versions we have in the tree.
W= hile the full history might theoretically be useful, I don't think it
is warranted in this case.

Warner
--00000000000038985e061315ea25--