From owner-freebsd-git@freebsd.org Sun Mar 29 21:34:22 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0390E265256 for ; Sun, 29 Mar 2020 21:34:22 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48r8456C5Pz40b7 for ; Sun, 29 Mar 2020 21:34:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 0AE06265255; Sun, 29 Mar 2020 21:34:05 +0000 (UTC) Delivered-To: git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 05850265254 for ; Sun, 29 Mar 2020 21:34:05 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2b.google.com (mail-qv1-xf2b.google.com [IPv6:2607:f8b0:4864:20::f2b]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48r83l0v6Qz40VQ for ; Sun, 29 Mar 2020 21:33:54 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2b.google.com with SMTP id s18so3503676qvn.1 for ; Sun, 29 Mar 2020 14:33:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ascFzMtJcbWIHydpqhoZn6xNLbRixcQ4K2bCv01aWPI=; b=dUJvgagvFpFOGM/IymwuBaqQhZ0qZFg7/w/QWgn1lAz3RF+nC9zgbk2YTkJdnIY/tf qqUiBPgBoM4TuqpXiyskNe+xPbrJN3QOdDuFpqNwVFBd2Nv5ORfVLYnh1w5qKES7NNLC W9a67WJhYHd0TJNJKWvkTcEZUnTWCsL3VgsDNB7bzWjLke0sHEXU/SVPknUrEdFFMPcX 5r5gqNYDAucSsDIbSMSRZhvdk1Eiob4G8mo5SmPp3OrsWvlbTvDHbyx75clJnIY15XJB hj5u29V76df7TiM2LXKf97fzYfj93Jkw3I6VMx+uUic8u4A2z23d/2B7tdEM8Nd0EWJb cmXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ascFzMtJcbWIHydpqhoZn6xNLbRixcQ4K2bCv01aWPI=; b=itYskOVbVvwA/UD90EU4CqpqkUlvFHcyPCUDu15RdBcZFMn6zODCNbnyVw5yESqimw jSbkz7OxvgKl/UFvSOqpfOvOVAlodq4Y0o34h7FcGT5m4Il2SFKg1canyXfjgec4jWnX f5aoLsSS44qH3F1+LaL5p4L1m70TSQCR/LOSGGRG+u0cLjHcdUctvcPRGgxqZst+FAmi uht4XLlr26rbHGEStiu9vfaR+whjs9WsLpLqsf3rC5xztvAxMWvJ1s24OouvCCaWWwrS D210kBeRsNEaOwQ9qF06Bx9T+cQp0KjscGDIFgoKizAGTwjaYHTvn7FX82GaxDqVqTOA txtA== X-Gm-Message-State: ANhLgQ1g97TVauoFfZOKa2RK+ZcHHnKKpatkoqvLcosxbjSJOqM1uwcK uaapbUeI9h07C7/yjgbREYIq/qgpiTXTW9aHRMEmuQ== X-Google-Smtp-Source: ADFU+vtN6J/VJ5dm36P4wbzZPFKlZFAA3+hTJZCojkdotGBFhXIQoFkad4ywNBzsa6FFbN5sWFaajRFLGYC/uKCyR0k= X-Received: by 2002:ad4:496b:: with SMTP id p11mr9109255qvy.202.1585517625927; Sun, 29 Mar 2020 14:33:45 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sun, 29 Mar 2020 15:33:35 -0600 Message-ID: Subject: Re: Strange commit To: Ed Maste Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org X-Rspamd-Queue-Id: 48r83l0v6Qz40VQ X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=dUJvgagv; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-2.25 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; RCVD_COUNT_TWO(0.00)[2]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[b.2.f.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-1.25)[ip: (-5.40), ipnet: 2607:f8b0::/32(-0.36), asn: 15169(-0.46), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.29 X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion of git use in the FreeBSD project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Mar 2020 21:34:22 -0000 On Fri, Mar 27, 2020 at 3:21 PM Ed Maste wrote: > On Fri, 27 Mar 2020 at 17:06, Warner Losh wrote: > > > > I'm sorry, that's a *HUGE* change from what we decided. And it doesn't > lose the ability for us to maintain our own local changes easily... > > My understanding has always been that we would maintain the vendor > history in our tree, as we do today in the existing svn2git conversion > (i.e. https://github.com/freebsd/freebsd) with elftoolchain. This is > the configuration that I have prototyped and experimented with. > > This does not and has never implied that we'd have *all* of the > upstream history of every piece of contrib software that we use, just > that in the history for a contrib component we have our versions > (i.e., what's in contrib/ today) as well as the snapshots > corresponding to upstream revisions (i.e., vendor/). > Ah yes. You're right. I'd gotten confused as to the exact context. Absent the ability to automatically and retrospectively generate git subtree/subrepo commit metadata (which would be quite hard and likely error-prone), that's the only way to record that. Warner