From owner-freebsd-git@freebsd.org Wed Mar 4 18:16:33 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 115CD27509F for ; Wed, 4 Mar 2020 18:16:33 +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 48XhsW6sTNz4fcP for ; Wed, 4 Mar 2020 18:16:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f49.google.com with SMTP id s24so3462341iog.5 for ; Wed, 04 Mar 2020 10:16:31 -0800 (PST) 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; bh=Mo0CiRmA8FtQXrUHYwPqrfoLnEY7uMiG7Wq/cbhb0QM=; b=UgJgohXJrD/8YdltnTYlf7VMi/YhcnXwyYC+sn1aSK+JjEJzkVUdL7ZaD7NwTx2HYd Kuv+iR1+kmoZXntauAvhDGhxCjU8nhnvwPIS5ee5VynkQMUMHPFEJ6ZSWJ/pZFX4695g 0zrzZlfj+UejsjvIYNIg6OjrilwBhTNM4aX+G1mEs1u4yYg7Pk4isx0CP1OVFAyWu56e OjlGtNCdBZVO5m+iDmAQuCHjy4rybDA+cnM5vEOCx54t/REUcbErKVCiuOUwlhsLiqtB JMvyGYoRJBooGvOofcVvXAM44x9wqUyQqxTY4Yq6buDhCb5WD3bu640kQoLoeIjuE2Wj EVoQ== X-Gm-Message-State: ANhLgQ08q2b/roJ9Alyj/r+/pxCRPgEz1GxnH7BDdnz3FAQDqUaTxz2t CFUWNEdVreWK5zASN3X7hC+q7KZOP0m3zASGt9O/eARp X-Google-Smtp-Source: ADFU+vstK/xzy0k9rhZSIKTpmJIobUT/oycVZ8qjzYcHf75o3cJsAf2ci1Qg5G9eVJu4EQQzs+KPpITLMWSOiQpePP0= X-Received: by 2002:a5d:9e0d:: with SMTP id h13mr3092616ioh.98.1583345788975; Wed, 04 Mar 2020 10:16:28 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 4 Mar 2020 03:33:02 -0500 Message-ID: Subject: Re: Another svn-git oddity To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48XhsW6sTNz4fcP 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 [-4.13 / 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)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; TO_DN_NONE(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[49.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.13)[ip: (-5.95), ipnet: 209.85.128.0/17(-2.98), asn: 15169(-1.66), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; DMARC_NA(0.00)[freebsd.org]; 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)[]; TO_DOM_EQ_FROM_DOM(0.00)[] 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, 04 Mar 2020 18:16:33 -0000 On Fri, 22 Nov 2019 at 08:52, Ed Maste wrote: > > As mentioned before there are some oddities in our git history - svn > commits translated to git in a slightly strange way. These have been > addressed and if/when we run the conversion from the beginning they'll > disappear. > > I've just found another oddity that affected attempts to use git > subtree for prototyping a method of handling vendor code in our tree. > I'm not sure yet if the changes to the converter would address this > case or not. > > The affected commits: > svn git Headline > r300828 00d578928e Create branch for bhyve graphics import. > r300829 b1cfc58d46 Initial bhyve native graphics support. > r302332 6775e12557 Import bhyve_graphics into CURRENT. Thanks to all who These commits still exist in uqs's latest prototype conversion, with hashes: 953b4a972bec 8efdfe5ee821 6d7144acee3e So they cause the same issues for git subtree; we need the Tom Clarkson patch set to make this work. I will try to see if we can do an initial bootstrapping with patched git subtree and do subsequent updates with upstream git - that would at least eliminate the urgency.