From nobody Tue Mar 5 22:46:02 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 4Tq9dn4G3nz5DZfc for ; Tue, 5 Mar 2024 22:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4Tq9dn1zVyz53W1 for ; Tue, 5 Mar 2024 22:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709678765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=v5WRAmTG8t7XygLbH3mkBI5BKQNjMdcUtXl6b05u6vc=; b=SK4jSxqnmBNQu0VG+PZBP/wCAb+S4whCEHlSg64oUn7fTARuDn53Iil6DXZd8AN0QC8Frk eF/1radzz4VKXLYrO2RUYLwqhrrWeKEterPkubdCJpjpqNIGDVhR7JxZxFoHCrixJjAs0s MOWb06eyDWOVJJp5tKbYL7/QVBCSTw4Y2xBdqGCZooq2UheCyN1Xtz3tvu4bDxOrKISUSo 6pzT3jVgIz+hPAyyfTEQjZmgbn2r3YDPKO2i1VPPmMOlpDkAylkM3fgsUuonj0+JbSdsG/ bzYwfUSRBOATFEUuqLyzsWwblSJCeSprAZEUkXOb9KreWI32jLI21jOIdOP5KA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709678765; a=rsa-sha256; cv=none; b=Nd4LNhkrwFuJCJBBDbOO9xxBbYDesE4gB9exdJLpO95RNjX/HDQ2rd5laLe3GEON6mwMMA mG/0hkAG18P1eDUqO17jC7SsuXDiw/DtUal0ML64E8IlbixqtoBpO7OlZStKGe+71B6bIG PwEcBJGEefh8rOqLHEHuiSHgjOP/jLv2L8AIAKErY0boMZ4jfoOTFMTEek4Fah4VKe6BOx FMF9MPPPFJW2Fd8znbVGR8MrIKskwWo5EaDd0YbweSXXX8EyvdrvwGZGHQH7Y5ujlk+2a/ t+aS9rtn+AwcQSmJ+zhMQqDfqkqZhJdq3F/P90dpVipmXVO1mAb4qbWtHBwOYA== 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=1709678765; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=v5WRAmTG8t7XygLbH3mkBI5BKQNjMdcUtXl6b05u6vc=; b=betRIm4Y/moJs8njzVHygNayKrs8TQ0Nv5ROk82B9AVrHcvmY+0RQBoW8f/F4ZuJoMfoQu JKTwPVu5R0sk3VYUSm2YTpoN8VgZ8i32n+voh3pRcwLBge8GPxtyqOhOr20uoBYkNgJIHW QDlGlbDwYUTmCEkge3oHzQcuYRVeQC0a4cPZ1RqEkfS7vE0NTiJ3g8KoD6tCJ3g2AnBT7c gNnRFNC22Cij7y3J8AqJsV9gduBK28HMjEe6jzabyrXgoTz3984Rwr55sSMiGFZGbbmfgb i/DtoyuX77GB/J6KWDTJBBxoS8l3EowwheDMcChmzMSS8oXxObFRIsVW06jjJw== Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Tq9dn0rKYz1Hn6 for ; Tue, 5 Mar 2024 22:46:05 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id CAB428D4A214 for ; Tue, 5 Mar 2024 22:46:03 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id 4396E2D029D8 for ; Tue, 5 Mar 2024 22:46:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id dLN6-ve5UnEx for ; Tue, 5 Mar 2024 22:46:02 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (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) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 673792D029D2 for ; Tue, 5 Mar 2024 22:46:02 +0000 (UTC) Date: Tue, 5 Mar 2024 22:46:02 +0000 (UTC) From: "Bjoern A. Zeeb" To: freebsd-git@freebsd.org Subject: vendor imports beyond the committers guide? Message-ID: X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 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; format=flowed; charset=US-ASCII 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? (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? /bz -- Bjoern A. Zeeb r15:7