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 > >