From nobody Tue Mar 05 23:23:34 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 4TqBTH2Fr1z5DdYD for ; Tue, 5 Mar 2024 23:23:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lj1-x22e.google.com (mail-lj1-x22e.google.com [IPv6:2a00:1450:4864:20::22e]) (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 4TqBTH09lKz56nS for ; Tue, 5 Mar 2024 23:23:47 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lj1-x22e.google.com with SMTP id 38308e7fff4ca-2d3fae963a8so6623551fa.1 for ; Tue, 05 Mar 2024 15:23:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20230601.gappssmtp.com; s=20230601; t=1709681025; x=1710285825; 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=Xx6UHTmpx5hW/DwC9Akj76wrq8i/DKewhKfyK4+ykVg=; b=ZeYjTqMuEgB4QShjg94YAlcxvfe0zTiVbtimcQ/E9aBwo51np35sZa8aW4Mhf50m+g 2o1i0go7lmpPYVtDU1nBCnkjmI3z8Mw8DadhME0HKNGXfCburTaLP+VtMzKNVMLqmOPQ 1mox2AqBXOkUJ4WYkjo+zU7qfIWyNllMTyhH6XP0LQz9Pb1BiUscLucDbTNkfmZmwrXz zwCpwU/0c9cBOFDoBgJjB0gdYiLHAtttwAb7HJL6uTBoOlHwCzt6iaCe3+srtwy0CRKT V9r9lWtoT6mEKK2c6RaBMJQn5ps844+7+a9YK6MojlelrRouk2g2rwN8eHjlmUiFCP8w wMFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709681025; x=1710285825; 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=Xx6UHTmpx5hW/DwC9Akj76wrq8i/DKewhKfyK4+ykVg=; b=Ol4hzEcF8x/jKCMFg7RicZ9Xyce8eJiMNJyq8ZYZ9ijR4wEyPWcIrplL00EqSC9pDM hT3vOx+/dVCSLRg4O9zHJbopUAzyMuVEjPqoapJOHKQI7kRJpDbEbwCrMJKsGfwW+/Ox CK0j+gRkmgfU+O2+op80LyvSIWLkhKYZO2QmA2f9GkV/CSBXh7lZpTeRUoie6QyJ0pV0 QS16wimWTPyiOBWjvc+m0MKngL+rSRzsgFGKAyk6lWc19glqmi+WtQ7FN3RBt2iEkicx XM+3/kDchXk94abaHSbb9wNpii9AMlEsc/JIVu8fljGVMwJnALHAtJuLcJJFSanrrVdw yguA== X-Gm-Message-State: AOJu0YwVIpBSTEQTmidccThOyrtXTjkzDso5mTLxUT+Cm9eoZYnZiLJn QQqwk4SqgnT+/woJ8UkMUIInjeIZ6LtpKF1ATocDYKhmR2CW3dPdpMab2eof3/Nb2TGCDG0mMjS XuegjkzbT00u/XKpSfF9CMhCOM74SfLR/M4MV/4Jr23RAetOJQek= X-Google-Smtp-Source: AGHT+IE7In8P1TjPNdHO/AennCY3zqL9wDyWMufrKUomkxf/ZsBH3LcOUZednvDZZtyFFOK7WDY0TzZDabwJM0YHV4A= X-Received: by 2002:a19:915d:0:b0:513:2b36:3195 with SMTP id y29-20020a19915d000000b005132b363195mr1943218lfj.51.1709681024897; Tue, 05 Mar 2024 15:23:44 -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: In-Reply-To: From: Warner Losh Date: Tue, 5 Mar 2024 15:23:34 -0800 Message-ID: Subject: Re: vendor imports beyond the committers guide? To: "Bjoern A. Zeeb" Cc: freebsd-git@freebsd.org Content-Type: multipart/alternative; boundary="0000000000002b40120612f222a5" 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: 4TqBTH09lKz56nS --0000000000002b40120612f222a5 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Tue, Mar 5, 2024 at 2:46=E2=80=AFPM Bjoern A. Zeeb wrot= e: > Hi, > > there's the edge case when we already have code in contrib which was > previously directly committed and now should come out of a vendor > branch. > > (1) how does one properly seed that case? > Was it direct committed to contrib? Or somewhere else? If you are moving it to contrib, just follow the process in the handbook + delete the old code in the same commit as you merge the vendor branch in (so the old history will be available more often)... If it was direct committed to contrib, then it's a vendor import + subtree merge + maybe fixups for FreeBSD. Vendor merges are just a convenience so that future vendor events are constrained... These details likely need to be documented, but what's the details here tha= t you need to do? > (2) given I couldn't see that mentioned either anywhere, for local > changes, they only live in main and stable/ but vendor doesn't have them > so in case of conflict they'll show up with the merge from vendor to > main and need to be resolved then? > stable branches don't care about vendor branches (except in some rare cares that almost certainly won't pop up here). You are just merging changes in main, via cherry-picking, into stable. Warner --0000000000002b40120612f222a5 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Tue, Mar 5, 2024 at 2:46=E2=80=AFP= M Bjoern A. Zeeb <bz@freebsd.org&g= t; wrote:
Hi,
there's the edge case when we already have code in contrib which was previously directly committed and now should come out of a vendor
branch.

(1) how does one properly seed that case?

Was it direct committed=C2=A0to contrib? Or somewhere else? If you are m= oving it
to contrib, just follow the process in the handbook=C2= =A0+ delete the old code in the
same commit as you merge the vend= or branch=C2=A0in (so the old history will be
available more ofte= n)...

If it was direct committed to contrib, then = it's a vendor import=C2=A0+ subtree merge
+ maybe fixups for = FreeBSD. Vendor merges are just a convenience so that
future vend= or events are constrained...

These details likely = need to be documented, but what's the details here that
you n= eed to do?
=C2=A0
(2) given I couldn't see that mentioned either anywhere, for local
changes, they only live in main and stable/ but vendor doesn't have the= m
so in case of conflict they'll show up with the merge from vendor to main and need to be resolved then?

stab= le branches don't care about vendor branches (except in some rare cares=
that almost certainly won't pop up here). You are just mergi= ng changes in main,
via cherry-picking, into stable.=C2=A0
<= div>
Warner
--0000000000002b40120612f222a5--