From owner-freebsd-git@freebsd.org Wed Mar 25 19:41: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 46FFB261ADC for ; Wed, 25 Mar 2020 19:41: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 48ndlW1m52z3HG9 for ; Wed, 25 Mar 2020 19:41:11 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id B7A83261AA6; Wed, 25 Mar 2020 19:41:03 +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 9977C261AA5 for ; Wed, 25 Mar 2020 19:41:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) (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 48ndlC0BR2z3H8x for ; Wed, 25 Mar 2020 19:40:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-pg1-f194.google.com with SMTP id u12so1645162pgb.10 for ; Wed, 25 Mar 2020 12:40:54 -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:content-transfer-encoding; bh=GzsPn2bvCCrmzBeDHla2wOr6c3kyXqKOsh9VQUuL28A=; b=UA5yPGGhu4B1YLf/31rg17s0qSz0W7BpEwuHwP97dUUa6MuYo3gGCWW4xptYztWQwJ 5cRj18erLwGS04U2K+iXyzy2pAsAXHOPHj3gudHsDqML1101bh/fqezJY41jkz3EuGcm Qa/5OPdY0ypNy2gAsL0woE6fRrpeBJqiYVMS0U0vD7Th0KqynIVnxGWYlrTOQgJ03fdw D5ivmZz+iabIyhZUXsFmSbNm24oavZs9mfO+6CwQnMTfK+nDrEqhCPb05Wb1anlGvrpr iWMaPuxI8MxIhNr5jEJUqGjlqQE6BJNcqFNHwVlez53e0GPTQzBV92ZVAqJoBQtEfJ7L YRRA== X-Gm-Message-State: ANhLgQ3lGvGaOz+77STcq6ig0Br/cHMgEFgNE+A17HGIf4jR8139o8Lb +YOqjEH40rowG9ee8TyPd6jp05k+X/N1lbO47am6657Y X-Google-Smtp-Source: ADFU+vuSDTCeP9qbmgghUELMfZJ9KhVHJrIINGLVVPIM6/wkICuhCUytfkkr0hallx9/Dzpq3x6rM7FOcncYbCpGFbA= X-Received: by 2002:a92:cb09:: with SMTP id s9mr4850925ilo.182.1585164782276; Wed, 25 Mar 2020 12:33:02 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 25 Mar 2020 15:32:49 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48ndlC0BR2z3H8x 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.215.194 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.44 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; 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)[194.215.85.209.list.dnswl.org : 127.0.5.0]; RWL_MAILSPIKE_GOOD(0.00)[194.215.85.209.rep.mailspike.net : 127.0.0.18]; IP_SCORE(-0.44)[ip: (-0.00), ipnet: 209.85.128.0/17(-1.65), asn: 15169(-0.48), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_TO(0.00)[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)[]; RCVD_COUNT_TWO(0.00)[2] 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: Wed, 25 Mar 2020 19:41:22 -0000 On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein w= rote: > > This is intentional, please see https://github.com/freebsd/svn2git/blob/1= a0b3e0230e1b2430e5d8eb91ac99aeff5a1614d/src/svn.cpp#L883 > > Only projects and user branches are represented as merges to master, as t= hey usually have a full tree. This seemed to match the git model better (as= opposed to the SVN model). IMO we do want vendor code updates recorded as merges. This is already happening today for certain updates (svn merge -c updates I believe). For example my most recent ELF Tool Chain vendor update: https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6ba4= 0c12ac5 From owner-freebsd-git@freebsd.org Thu Mar 26 02:12:56 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 3194426D6E7 for ; Thu, 26 Mar 2020 02:12:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48npRL00YLz4HcG for ; Thu, 26 Mar 2020 02:12:46 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 7217926D09A; Thu, 26 Mar 2020 02:05:53 +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 61E6026D099 for ; Thu, 26 Mar 2020 02:05:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 48npHC2fC0z4FKB for ; Thu, 26 Mar 2020 02:05:42 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72f.google.com with SMTP id c145so4922438qke.12 for ; Wed, 25 Mar 2020 19:05:42 -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=nszH30Jh2xxCODBgF9BUU0l0ereZJ+ClqaMsFmw3UUE=; b=ZikF1xFE2tPl05cvk7akRntFJlcPQCp1LdLtqdECkeIBosS57WKqpPjnwrs4sUnIga +OkHykMZPFGOt/3d5r+XfNSSWJ/Lywd9LOCLA4vD6LoXZfyQVhDvQwF6LBMf3JG2uKT+ p8sTCh+hkzXdyV92t61zmu1YlkKQLe2KPd2m0a7J3pzArdYEpSfbCKBfd2xpWBJhesjt g9eA02Cntj81gfJn5KO1dTMEYo9raHldrC5HzlSP1YrTpJS01/kapa8OnQhqgZBWnAB8 4SWtNjTqjNmncNWjfI1P2lPpjoL7LptTYaWh9zF85kVMHJOMci3IGPiKr3RFU96apF3H 0BHg== 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=nszH30Jh2xxCODBgF9BUU0l0ereZJ+ClqaMsFmw3UUE=; b=TFbvRdReGwYnGphs6jpCN0/ul5R3qjN6dxASZkPbnE4VB1pIA2vjUOdLwML2Sz4bRk u5W9kH9b9KbOsm/MpoRS+1EL88qCZXg8y/gTQmT3+ns5isWdHuzPpPhL9d+bcmAo0CCO xLfreDXnOTFyiBW4QVg5QRu3j8khOOjiTTEZwT2Nk0Gp3eeGETxTi0XkaZCt0pfBQsKA /4XgC19DNpa7MG3vKEnMNkllcLz7KvawKk8xZgr5BoBUeQ6R/7aAcE6RD4FwaUAqNwWH 94zF0CH5J4zenXH9MgcI8iVy0/LLGyyULWXpwHGSKSyQxWKIFHgUn5aklEghA+zlavjH +t/A== X-Gm-Message-State: ANhLgQ0PklYbpPhsAoxgM/nOymWMKfkPTbTjILZsitGZYoiSf5usIcCM ei4m0apHc8zltQMZd/Kz8brxGf5f5qhIxo1YAxmGxF3h X-Google-Smtp-Source: ADFU+vshjhVIaaRYqBTtJsRdQfSj/YN+P+QwIqNsia/LZXEiSpAwBvQQGu/Ks396cpzhVJamzHNEQc7DRTRFjpoOfeg= X-Received: by 2002:ae9:d886:: with SMTP id u128mr5472944qkf.240.1585188334856; Wed, 25 Mar 2020 19:05:34 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 25 Mar 2020 20:05:22 -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: 48npHC2fC0z4FKB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=ZikF1xFE; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72f) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.04 / 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]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[f.2.7.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(-2.04)[ip: (-9.31), ipnet: 2607:f8b0::/32(-0.37), asn: 15169(-0.48), 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" Content-Transfer-Encoding: quoted-printable 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: Thu, 26 Mar 2020 02:12:56 -0000 On Wed, Mar 25, 2020, 1:33 PM Ed Maste wrote: > On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein > wrote: > > > > This is intentional, please see > https://github.com/freebsd/svn2git/blob/1a0b3e0230e1b2430e5d8eb91ac99aeff= 5a1614d/src/svn.cpp#L883 > > > > Only projects and user branches are represented as merges to master, as > they usually have a full tree. This seemed to match the git model better > (as opposed to the SVN model). > > IMO we do want vendor code updates recorded as merges. This is already > happening today for certain updates (svn merge -c updates I > believe). For example my most recent ELF Tool Chain vendor update: > > https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6b= a40c12ac5 How do we both do subtree to not not have the vendor repos commingled inbour tree and do this? Warner > > From owner-freebsd-git@freebsd.org Thu Mar 26 02:36:51 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 22F9926EA73 for ; Thu, 26 Mar 2020 02:36:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48npyy04kCz4R2f for ; Thu, 26 Mar 2020 02:36:42 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 5827F26EA66; Thu, 26 Mar 2020 02:36:34 +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 567E526EA65 for ; Thu, 26 Mar 2020 02:36:34 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f195.google.com (mail-il1-f195.google.com [209.85.166.195]) (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 48npyX1Gq7z4QwC for ; Thu, 26 Mar 2020 02:36:17 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f195.google.com with SMTP id m7so3984071ilg.5 for ; Wed, 25 Mar 2020 19:36:17 -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:content-transfer-encoding; bh=MRb19krLxJ7HyydLDkqBxLvjUhnqUsT6rc/xDBXL0ig=; b=DSj3YKZFgcVVsdoUjopiaoeU179RJSVDi97+jm/3PjqHZoO0eYjI3cKOIQusQCq0hg j3IQJmNX1AC98bZ/GxsXXwzMaIc+LNGDr4sj5CX0m7XsZ3sc2jDFi+QbUnm/kzwk1GKp Qp+Va+E2+2ReO3tYHj95i20DOBBkKXFDS2Xg9BE6sw4dKNixMCvJQKm4DzehkUDAEWlj YuEs3RuN3zBNVzBB8vxvXCba25t0GHuTVXBbwQ+HWakyC01tEwOX4elDdNLSmecCvnt5 JjJ5jLvW9dBplCCVxFUvh4jT3EHMnvqy3patelC3nv5IwfmWqIjtDx97vNAigZHZi4G/ T+OA== X-Gm-Message-State: ANhLgQ11L/hnIfS37mh+f21ks942ji8P+/QAxC5/w48cEerCHP3uPIpo l6L7nysrC8DAfkJs0puBnyTbA6aD6+mU5ra5aZg= X-Google-Smtp-Source: ADFU+vuU1aMYrGStpFlD5ZKQ5/xRLJAIt0zw15NfDz7RmZ2/iTeM/Iv+Ah65SNMRYMFZ/dHhYYJCz6jOfoUO6BNEZP0= X-Received: by 2002:a92:778e:: with SMTP id s136mr6697940ilc.256.1585190170245; Wed, 25 Mar 2020 19:36:10 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 25 Mar 2020 22:35:56 -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" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48npyX1Gq7z4QwC 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.195 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.41 / 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)[195.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.41)[ip: (0.04), ipnet: 209.85.128.0/17(-1.54), asn: 15169(-0.48), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[195.166.85.209.rep.mailspike.net : 127.0.0.17]; 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: Thu, 26 Mar 2020 02:36:51 -0000 On Wed, 25 Mar 2020 at 22:06, Warner Losh wrote: > > On Wed, Mar 25, 2020, 1:33 PM Ed Maste wrote: >> >> On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein wrote: >> > >> > This is intentional, please see https://github.com/freebsd/svn2git/blo= b/1a0b3e0230e1b2430e5d8eb91ac99aeff5a1614d/src/svn.cpp#L883 >> > >> > Only projects and user branches are represented as merges to master, a= s they usually have a full tree. This seemed to match the git model better = (as opposed to the SVN model). >> >> IMO we do want vendor code updates recorded as merges. This is already >> happening today for certain updates (svn merge -c updates I >> believe). For example my most recent ELF Tool Chain vendor update: >> https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6= ba40c12ac5 > > How do we both do subtree to not not have the vendor repos commingled inb= our tree and do this? I'm not sure I understand what you mean here, but there's no problem for us to have the original snapshotted history just as we do with merges from svn vendor branches today. From owner-freebsd-git@freebsd.org Thu Mar 26 23:47:56 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 2486A264BF7 for ; Thu, 26 Mar 2020 23:47:56 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48pM9d0lnGz4LxY for ; Thu, 26 Mar 2020 23:47:49 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 643A8264A40; Thu, 26 Mar 2020 23:37:53 +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 5EE42264A3E for ; Thu, 26 Mar 2020 23:37:53 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 48pLxy18zkz4HkV for ; Thu, 26 Mar 2020 23:37:42 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id h131so8042759iof.1 for ; Thu, 26 Mar 2020 16:37:41 -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:content-transfer-encoding; bh=tHshFCRxejnI9RO9xss2iTMQ/KbqxkzjgNkqA5hgPp8=; b=GQ4MXGLYsX0xN0azRvxGYHyTY6LllDh6ntSSq+VpJMN9P0LYXjDkGCwvr5y2/BQ+CQ QkgvPbib2RERhtCWUtUQn3gUmrbFkojVRtyB/ylDJ7lDawzwAVrat3ne3p5xo2NS/KDY AIKXNndE5TuJasK/C8S7oRbllV4ruoDyrQ4mzbo8w9lrWRMNa675JPHacX3FxKCuMmCH kwdCqUht+Oj3AKcNPFE8hYtGaWznqy0EZ8TXovH+IEzFd2LzbUTEq0BaqC+7SbhfJlx1 OUDl9sVaTp3ZsOuoh+PGexOGRZqygYrj+449AYd7guRiH2PPIReYadiGuPtxcx4A88SX 4UIQ== X-Gm-Message-State: ANhLgQ0kVB5erRAsa3YjAwR0G2wnQxz90/QRd2QXr2Ow20PZPyaBUBdt McWLj+Jmw7hY4OYrQQ2Lp7fXH7IVF3aDr7JUhnI= X-Google-Smtp-Source: ADFU+vtSOCywPaOV01vGcksaNOsTv7J8Ly/+jrcD5IU4fOEruZKXbykV7cYJu3x4CRb9DY1k7C036OUAtphgVwBaHcE= X-Received: by 2002:a02:ac09:: with SMTP id a9mr10069303jao.128.1585265852601; Thu, 26 Mar 2020 16:37:32 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 26 Mar 2020 19:37:19 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48pLxy18zkz4HkV 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.49 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.60 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; 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)[49.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.60)[ip: (-6.17), ipnet: 209.85.128.0/17(-1.28), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[49.166.85.209.rep.mailspike.net : 127.0.0.17]; 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)[]; RCVD_COUNT_TWO(0.00)[2] 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: Thu, 26 Mar 2020 23:47:56 -0000 On Thu, 26 Mar 2020 at 15:58, Ulrich Sp=C3=B6rlein w= rote: > > I guess you're right. Seeing that vendor branches (while not a full > tree branch) are usually "short" in terms of history (only a few > commits, one would hope), I guess we should indeed represent them as > proper git merges. > > Can you open a PR on the git_conv project, please? I will, but I'll have to run the conversion again saving the output so that I can figure out what branch name(s) are involved. From owner-freebsd-git@freebsd.org Fri Mar 27 17:01:08 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 1CB1327B1F3 for ; Fri, 27 Mar 2020 17:01:08 +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 48pp5m5QRRz3R4l for ; Fri, 27 Mar 2020 17:01:00 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 8010027B1BA; Fri, 27 Mar 2020 17:00:54 +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 7317927B1B9 for ; Fri, 27 Mar 2020 17:00:54 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) (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 48pp5T14qZz3Qys for ; Fri, 27 Mar 2020 17:00:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f177.google.com with SMTP id g15so9386930ilj.10 for ; Fri, 27 Mar 2020 10:00:43 -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=p3z0DsWhNliSCMTieI1ZZ41HyRMsKHIbj2NUbKZiCP4=; b=dgRn4xWHFy3M75zI/E19SsSlgDMcl7EWg1MbAeSU/Tsk6SVZPZjDHQqFZC76sAHAna wgaPEcL0Tx7lB9d/v2ztn2uhxzHdiLN6MhGRjYnxaJyzJGOXJ+I1qWB1YJLQp1BDtHrD f7lSFlpGcZvNPB27qOh8MFoeihyYDOo6DH2Y1LphQSZshkIQ6bIYYFN80k7yBuuY019T uepuVTdcWRiyfmqLOjZClX2OQAuKGG4Ajrft/XUYkNCoPxuEVaomhxKtBALbhoEgDZv3 bSTIaLNOEt9+GaM6Q8pmR/S8YH70aWQmySc023DjwyWZfIJqYHsIRV1pAqs71eVY4bET L+lg== X-Gm-Message-State: ANhLgQ15c9EbBYowtG5bn/1KJKWpdcNgHeXc6z4mBQqO5O2BCu+BGn6g ucIrV0cZ4UNDt3Hz7e+2tm43aSDO6fFrQiju6+M= X-Google-Smtp-Source: ADFU+vuwV0x6LJ+qooPBHSfJem1rnpX55KdRhl4Hef4KocjcyBuS+6CLnQL22owSeJk51FlJw3HiPypDeKv69A6efbQ= X-Received: by 2002:a92:41c7:: with SMTP id o190mr53244ila.11.1585328435998; Fri, 27 Mar 2020 10:00:35 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 27 Mar 2020 13:00:23 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48pp5T14qZz3Qys 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.177 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.76 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; 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)[177.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.76)[ip: (-7.15), ipnet: 209.85.128.0/17(-1.11), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[177.166.85.209.rep.mailspike.net : 127.0.0.17]; 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)[]; RCVD_COUNT_TWO(0.00)[2] 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 17:01:08 -0000 On Thu, 26 Mar 2020 at 19:37, Ed Maste wrote: > > I will, but I'll have to run the conversion again saving the output so > that I can figure out what branch name(s) are involved. Ok, it's not clear to me what is responsible for avoiding merge metadata for these commits. In the hack you referenced: > if (path_from != NULL && prevrepository == repository && prevbranch != branch > && (branch.startsWith("master") || branch.startsWith("head") || > branch.startsWith("projects") || branch.startsWith("user")) > && !prevbranch.startsWith("stable")) { AFAICT the only condition on the "from" branch is that it's not a merge from stable. From owner-freebsd-git@freebsd.org Fri Mar 27 18:55:25 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 27EE627E306 for ; Fri, 27 Mar 2020 18:55:25 +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 48prdf1g5mz4gFS for ; Fri, 27 Mar 2020 18:55:18 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id 57DE927E2F7; Fri, 27 Mar 2020 18:55:09 +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 43FCE27E2F6 for ; Fri, 27 Mar 2020 18:55:09 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f48.google.com (mail-io1-f48.google.com [209.85.166.48]) (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 48prdM1p7Vz4g9f for ; Fri, 27 Mar 2020 18:55:02 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f48.google.com with SMTP id d15so10949585iog.3 for ; Fri, 27 Mar 2020 11:55:02 -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=cmuPy5ccBP+aluuaRtlA7wbq57v2l3L9Fdci9mzCeVA=; b=FnhsKzkyoZxoHwg9hOMUoV9VyCTLsorMumYfqqIelzlNXwNRGJNM3/WbB4Z5uwBh5C V1K2HIBaC9H6IKKMW11qIpmAvn6HbdvKNdiH5i6a5YtE3xbyp0Fp6vzmnV8H5NflA44s MKQGSnw9Jd7Ev6bWi5EwfdGEZKaM3FKrCqBZ3FbCVFHmvkW0OVpXmdOsVYLQPoUHaxQg 8rPbtszxt45usyMFcDVtLnKqI0fVwnx1qWFBUGeIhK/9rvQ5LcyMWrYM5ytfayOE0JsN tkByXzemsDD2l+ypPOVSZuaq23mj2k+zqO9osejHQraU4bGWQ8lx7GNAKuYE50GJ+Ea3 gfCw== X-Gm-Message-State: ANhLgQ2ka8IDnU16jb0tnBhF/9iCUILHwT00icEqp42VMwhs2laQmm5w aZEj8ZlLd6mpHU3KvpGMX4DEoU++q79bPupgehXvJkOM X-Google-Smtp-Source: ADFU+vv9/8eB+IbwZ51pAZ0SYu/eptJmw+lLzRZzGmYCXAW5l5CQu9SQ/XyvdxLLgDvaXPjC+rpiU1UMnqbj4caqZwo= X-Received: by 2002:a6b:c8d4:: with SMTP id y203mr36714iof.111.1585335291303; Fri, 27 Mar 2020 11:54:51 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 27 Mar 2020 14:54:39 -0400 Message-ID: Subject: Re: Strange commit To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: Warner Losh , git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48prdM1p7Vz4g9f 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.48 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.63 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; 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)[48.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-1.63)[ip: (-6.54), ipnet: 209.85.128.0/17(-1.10), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; FREEMAIL_TO(0.00)[gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[48.166.85.209.rep.mailspike.net : 127.0.0.17]; 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)[]; RCVD_COUNT_TWO(0.00)[2] 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 18:55:25 -0000 On Thu, 26 Mar 2020 at 19:37, Ed Maste wrote: > > > Can you open a PR on the git_conv project, please? > > I will, but I'll have to run the conversion again saving the output so > that I can figure out what branch name(s) are involved. I assumed you meant PR as in pull request here, but now I suspect you meant it as a general term for a bug report and I see that it's open as https://github.com/freebsd/git_conv/issues/1. From owner-freebsd-git@freebsd.org Fri Mar 27 19:17:59 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 0EE5A27ED12 for ; Fri, 27 Mar 2020 19:17:58 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48ps7g0XJJz3LKr for ; Fri, 27 Mar 2020 19:17:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 8C4A527EBAA; Fri, 27 Mar 2020 19:12:12 +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 6789827EBA8 for ; Fri, 27 Mar 2020 19:12:12 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x836.google.com (mail-qt1-x836.google.com [IPv6:2607:f8b0:4864:20::836]) (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 48ps0z4KZWz3JRr for ; Fri, 27 Mar 2020 19:12:03 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x836.google.com with SMTP id f20so9560472qtq.6 for ; Fri, 27 Mar 2020 12:12:03 -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=eDmAjLDr8xQZyCIs6zp4v3IkSjyNE8CGC7Gp85jRoh0=; b=mEA3mfLf+ePqx/Cs53i6oakZkB9nwgMpFng3bRJ4z8FB6SulPjQlYp49vef8pnJMaB +33VJV6eeLFYPfhL5/wICoOXsC6jpu8iNalfSRHY8/KlCkUKchGP4gV5LP5EOGZCaAJZ ccNLXNz5EsdjF87UdR+HZaRL97FANa6z5JjG7DC7DvM4zszbhyr8dOp4dRVORTby9SMo qIkd0OyPGmzxJGqVPSwwrgiBaem4VRdk8hgbapPM2+2YgtCLW4GQfzxc4JA/tnB1m1Dv wP00oxajb7xiUXuiE/XpruPLPK50aXN7VgOVLT5woi7IkEJz5F27/djRx0wlb2k/CQaf krgw== 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=eDmAjLDr8xQZyCIs6zp4v3IkSjyNE8CGC7Gp85jRoh0=; b=ZjPyBq3fiq1iaEzNEbaLSitELdi7m7WpDgbmUzkg+EMGChczWkX824lSrrKhmPzDF+ Q1vX1MVObKz+7VYsX5YCW5SOXOVB6iHK9dUIG1P4xrwzFiaVghGwW9e078mTGtndFfOu Qk0zmAZSsCJOEkhNtGsGDL1Vs3pUO+zqRQmghWlI7vc9ciVdBBfM2HcUCauF0rordG1q hhsBMBfslb8k5wtRCPc8TI1bUzUzQPLh/nMFgUctiifKbSCvUOB1lfGHRAQw0P+LENVi XVxZqTNWw+jBz0O9OXAbaA45QKF1CRLvu/cQTiVJUw6AZJqaJSnomfOhLfG5bCVdE63I I8LQ== X-Gm-Message-State: ANhLgQ1r43FJV63ZY2i2pm0+mdWtgzyHv8hWoa4daPVRjmi5vnGAycrH v+c3wEsjYCJ/rYVux5wnV/kpfVTnp9OazEcUNqnSDg== X-Google-Smtp-Source: ADFU+vtuF3tchma6E2y0qc4x/YJ4zdkIEGhRudB39JhptNk9b4+yFhPiA0+lOqGHCVHnVAZb7JNncx9s5RXTKojCdDk= X-Received: by 2002:ac8:3488:: with SMTP id w8mr768358qtb.187.1585336315135; Fri, 27 Mar 2020 12:11:55 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 27 Mar 2020 13:11:42 -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: 48ps0z4KZWz3JRr X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=mEA3mfLf; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::836) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.00 / 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]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[6.3.8.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(-2.00)[ip: (-9.13), ipnet: 2607:f8b0::/32(-0.37), asn: 15169(-0.47), 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" Content-Transfer-Encoding: quoted-printable 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: Fri, 27 Mar 2020 19:17:59 -0000 On Wed, Mar 25, 2020, 8:36 PM Ed Maste wrote: > On Wed, 25 Mar 2020 at 22:06, Warner Losh wrote: > > > > On Wed, Mar 25, 2020, 1:33 PM Ed Maste wrote: > >> > >> On Wed, 11 Mar 2020 at 05:20, Ulrich Sp=C3=B6rlein > wrote: > >> > > >> > This is intentional, please see > https://github.com/freebsd/svn2git/blob/1a0b3e0230e1b2430e5d8eb91ac99aeff= 5a1614d/src/svn.cpp#L883 > >> > > >> > Only projects and user branches are represented as merges to master, > as they usually have a full tree. This seemed to match the git model bett= er > (as opposed to the SVN model). > >> > >> IMO we do want vendor code updates recorded as merges. This is already > >> happening today for certain updates (svn merge -c updates I > >> believe). For example my most recent ELF Tool Chain vendor update: > >> > https://github.com/freebsd/freebsd/commit/ca8624403626d5a4e13f5006026ca6b= a40c12ac5 > > > > How do we both do subtree to not not have the vendor repos commingled > inbour tree and do this? > > I'm not sure I understand what you mean here, but there's no problem > for us to have the original snapshotted history just as we do with > merges from svn vendor branches today. > The vendor repos we wanted to do would be complete on their own. We don't want the revisions of those repos in the main repo. A merge commit would make us have them in the main repo. Then again, maybe this eliminates subtree if we can't do that. It was why we were looking at the other one: it creates a repo that is independent of the merged in repo and it requires no extra modules for our users to install. Warner > From owner-freebsd-git@freebsd.org Fri Mar 27 19:30:53 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 490AE27F576 for ; Fri, 27 Mar 2020 19:30:53 +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 48psQg54z2z3Qbn for ; Fri, 27 Mar 2020 19:30:51 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id C678027F437; Fri, 27 Mar 2020 19:30:43 +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 BB5CA27F436 for ; Fri, 27 Mar 2020 19:30:43 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f43.google.com (mail-io1-f43.google.com [209.85.166.43]) (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 48psQJ12cYz3QVC for ; Fri, 27 Mar 2020 19:30:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f43.google.com with SMTP id q128so11012794iof.9 for ; Fri, 27 Mar 2020 12:30:31 -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:content-transfer-encoding; bh=yGfyQxxGTwxeswlxtPtyxnIDCVVXrXegncZC7zdxEF0=; b=Bpkt+116NQpFtGltV5Lor+c5l7vS7suyj3ozfMq6Yj45SU3kGjO5ejIsyz9W5CmBc5 6PoZPGSTkKhWlgINt8nhEQJMP+Tde1qpmmkHXi3N6xEY5AAROcW+gqjmHeRxDhDnaIOp BAmMkOLHFmlioM4sXwNwqdwFaic4TxUnLgdL62Q7BTd8QxI7ZBd4+IJU0yyfX7fBe15m jnAqXS8nRfJ//aYU51JwIIKFg/m3At/Y6Jv0IG63Uf6JJBs2K4QH8XRrLQKlDyw10v09 ZFI4tNXClG9r+JIuA3twlaHwR5AoH01oEy6Gzw41doovoJdKaQxH4jlPhrlJaLfUO0vS klzw== X-Gm-Message-State: ANhLgQ21JPgxo+XYmuPeYNwwG15OQZRG/WhB+39D3KPgoAoZW59Y9HfW LLqoIDhs90LZhpeEFhDUFjLMA3CQ+DxYN68lkjI= X-Google-Smtp-Source: ADFU+vsKvgfkY2cDoexkOHdmIRY3kkKu4uWsGzXRAtF1S7AeZ7F2cND2oGdu1Mvz+MClbCfutzMBOZuF+b3jibkx7xE= X-Received: by 2002:a6b:fd08:: with SMTP id c8mr234229ioi.102.1585337422680; Fri, 27 Mar 2020 12:30:22 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Fri, 27 Mar 2020 15:30:08 -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" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48psQJ12cYz3QVC 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.43 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.99 / 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:c]; 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)[43.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-0.99)[ip: (-3.33), ipnet: 209.85.128.0/17(-1.09), asn: 15169(-0.47), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[43.166.85.209.rep.mailspike.net : 127.0.0.17]; 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 19:30:53 -0000 On Fri, 27 Mar 2020 at 15:12, Warner Losh wrote: > > The vendor repos we wanted to do would be complete on their own. We don't= want the revisions of those repos in the main repo. A merge commit would m= ake us have them in the main repo. Then again, maybe this eliminates subtre= e if we can't do that. It was why we were looking at the other one: it crea= tes a repo that is independent of the merged in repo and it requires no ext= ra modules for our users to install. We do want revisions of the contrib code in the main repo, otherwise we lose the history and the ability to easily maintain our local changes. From owner-freebsd-git@freebsd.org Fri Mar 27 21:06:50 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 B3558261682 for ; Fri, 27 Mar 2020 21:06:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 48pvYN56GFz4Wq2 for ; Fri, 27 Mar 2020 21:06:48 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 19B38261681; Fri, 27 Mar 2020 21:06:38 +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 14996261680 for ; Fri, 27 Mar 2020 21:06:38 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com [IPv6:2607:f8b0:4864:20::829]) (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 48pvY33w0tz4Wkm for ; Fri, 27 Mar 2020 21:06:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x829.google.com with SMTP id t9so9831614qto.9 for ; Fri, 27 Mar 2020 14:06:31 -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=f4/AWcAuDKg7TsiN8CEVC1XT44KqHbT1qPW68yb1neQ=; b=r89xsDzJOB+QxaCe9V3qO/jxDDm7RHMsBUPR22jbmVNBFYFzEVVjsRhhlCNlGTgJyC cfodT2AmQnco+HWxQXc52hz/xF+k8AnigcbP4FtlG5vXxWaifLAjto0GUkqfKu0zmn0Z acaPy1mTgyCKv2e6cCLTUJ5XcdfjXWZhB0UdJu83jK7VXcQ1d0H1IMxW4YvShH/bGvCs fK+dZRruNCGBw6ylkYIHRs8YiD8CsgLD8my/DgiIAAPs6Kxf8mwaKZLFckHOMp1iyayw 9+X8NMRqT87/M74ETQ2AALo5clEq/1TVlC9e1CFsKOWtKBcniBQeoHZoumz51mowwp+P Ysjw== 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=f4/AWcAuDKg7TsiN8CEVC1XT44KqHbT1qPW68yb1neQ=; b=bVcD93+Wq6n08Bjsf9gp/LJjCDLgRKdM+T+h+MoQX2P2D1BAgCjcLu8AnyFnWBI1LM 24nLDKU6XI89OrHzmP3fYqokD6EaOa0KzMLylzthyeDvIeOAl3s4d2P4EzydiVU0hgPX 9Q9O8C4y65bx86fvBueW6SnRh3sP4IZulaN/ufXDTSjIZtgXnI5kPRIkxh7wWmwY5vis MPoTsIeuErWxWovX/RLkCX5fdMDIoB/+zgdzBUrgPZo0Cw6e2DF4ha1J5nNGoFhiWnkX 5s5fQ9AAWQGoqsBH/qA8iUrWwPf4zMZ6TmV05ASTeu6zIpYB+DSaNRC/NpQHM2YxsCl4 g04A== X-Gm-Message-State: ANhLgQ0xViYV+p1cmqTbQtPO/tCwP39Tb1dosB0CsWz083s9djiZPvMi Yqwa/1jrJq+Q7BDQeripUYw8kNZ7vxbHzb6tXh7758wx X-Google-Smtp-Source: ADFU+vuIp08/bLF7meTBujF8P0Xjc8AgjTjNjYxPfx/NJ18+jotrtLt/T6+hM1/r5tt6Fkwo4ofLNheGqM9WplI28/4= X-Received: by 2002:ac8:3488:: with SMTP id w8mr1252416qtb.187.1585343182187; Fri, 27 Mar 2020 14:06:22 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 27 Mar 2020 15:06:10 -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: 48pvY33w0tz4Wkm X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=r89xsDzJ; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::829) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.03 / 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]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCVD_IN_DNSWL_NONE(0.00)[9.2.8.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(-2.03)[ip: (-9.27), ipnet: 2607:f8b0::/32(-0.37), asn: 15169(-0.47), 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: Fri, 27 Mar 2020 21:06:50 -0000 On Fri, Mar 27, 2020, 1:30 PM Ed Maste wrote: > On Fri, 27 Mar 2020 at 15:12, Warner Losh wrote: > > > > The vendor repos we wanted to do would be complete on their own. We > don't want the revisions of those repos in the main repo. A merge commit > would make us have them in the main repo. Then again, maybe this eliminates > subt free if we can't do that. It was why we were looking at the other one: > it creates a repo that is independent of the merged in repo and it requires > no extra modules for our users to install. > > We do want revisions of the contrib code in the main repo, otherwise > we lose the history and the ability to easily maintain our local > changes. > 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... We decided, specifically that we'd export the vendor branches, vis git subtree, to their own repos that would live under our github. We'd then use git subrepo to them pull in the changes into src/contrib, et al, as a single commit with tracking information. This would keep us from being the union of all possible upstream repos (think llvm). We'd have sufficient tracking info to know the history, but it might be a little awkward to pull it all out since you'd need to download the extra repo and install git subrepo. In that scenario, they most definitely aren't merge commits in the classic sense (logically they are, and subrepo records enough details... we thought subtree might also do it too, but that was a point that was supposed to be investigated, but I'm not sure if that detail has been). We were also, IIRC (and I may not), going to bootstrap the vendor branches so any of them could be used to update from the get-go in the new git repo so we wouldn't need the 'vendor branch collapsing' stuff from svn, because we'd have already done it in svn prior to the export and because the exported repos would be sufficient. Maybe we should chat about this stuff again, but I have a very very clear memory of all of this, and thought it was a good plan despite some initial misgivings. Warner > 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/).