From owner-freebsd-git@freebsd.org Fri Mar 27 21:22: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 7C6F0261C54 for ; Fri, 27 Mar 2020 21:22:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 48pvvF1jQ1z4ctY for ; Fri, 27 Mar 2020 21:22:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 12A94261C3A; Fri, 27 Mar 2020 21:22:11 +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 EB741261C39 for ; Fri, 27 Mar 2020 21:22:10 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f171.google.com (mail-il1-f171.google.com [209.85.166.171]) (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 48pvtv5Hx8z4ch8 for ; Fri, 27 Mar 2020 21:21:58 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f171.google.com with SMTP id k29so10154981ilg.0 for ; Fri, 27 Mar 2020 14:21:58 -0700 (PDT) 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=AcKXph6EFucRzoBJnXc119qjEGAKR8slziiqp5boC6o=; b=okxVf5rUhmWbN8y+U02mFKi7sVDQwRSWZDxBAD/XtRS9ItmrWTYn+EuoeRwT5dXA0R cGTYvxo6z14+SVzeLYh0AP1TiilrQ9R2c/z8zAOzcndMZjasxJBOHDoDXoXzYLhQbnrO gU3iU7Ekt35IYkcxGW5nkyrPJzMwvWyXycacPN8ITTJI+kBSnr2HKtLHbtETot/vjNDm DkTld2aktinrxXLyjSzpgGue3Q0KW+dxL+KYomfM/Q5wiWa9RylxAlG921um45O1dpkt RP3SDAS9gFeqH+H1zOBD87IwMg2hsSRhEST0jc0q3OnDyzHow7WLYyZIJulQVv+CYBVq iiIg== X-Gm-Message-State: ANhLgQ3hhqcQXyoiiYQr9vfm2z/2trFw9dEnYsesYIpxE+hLrm3BIIRc i84dKSD9zWNaap7STBkLmvOG67qvk5v5MF1/SLOhoQ== X-Google-Smtp-Source: ADFU+vsWTuyo3JyhEjZxeI8ghT4tynCNF5JVNMWlqX9eB+peAGwhirKrM+40Tcdko5qkAlV50vbmMjfDhLs1EOfJH80= X-Received: by 2002:a92:cb09:: with SMTP id s9mr1101521ilo.182.1585344112219; Fri, 27 Mar 2020 14:21:52 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 27 Mar 2020 17:21:40 -0400 Message-ID: Subject: Re: Strange commit To: Warner Losh Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48pvtv5Hx8z4ch8 X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.171 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.38 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[171.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.38)[ip: (-5.31), ipnet: 209.85.128.0/17(-1.08), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; RCVD_TLS_ALL(0.00)[]; FREEMAIL_CC(0.00)[gmail.com] 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: Fri, 27 Mar 2020 21:22:22 -0000 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/).