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.