From owner-freebsd-git@freebsd.org Wed Mar 4 19:53:14 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 98EDF277339 for ; Wed, 4 Mar 2020 19:53:14 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-io1-f66.google.com (mail-io1-f66.google.com [209.85.166.66]) (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 48Xl142kwWz4TmC; Wed, 4 Mar 2020 19:53:12 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-io1-f66.google.com with SMTP id d8so610113ion.7; Wed, 04 Mar 2020 11:53:12 -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:cc; bh=IQv+nm9Ozr+SKEh7U8+L2/asBHWeJRUva63Z+qGwbGk=; b=NwOIMiBMqzorRMRCkX1N0cvVZrmUrZnAFT4n7HSOVV+Tjdc1aSZutjex+dD/Gki4Qk zrAdMghY4p0/mywV//Wetb1HWemBoU0pYJU/7SObmww4UPIGbIMIDwReyNdWyV1xKUGD djkNE/4NvJq3OoZiQGVrU2oyMdpXSHopyLEscHLsk8e5pJByKWFZqJdW8kZ7lIoVgkvu eQkZGFIJVR10Ho0RRL5UI0BFnSlvvsjf1H76NUR7hyMUgryTV0M1R9emg6AWdfIQ5YEa 8GCD9OpQIYCSn1a8bfOPjL1BD+gwQZUWut5ZhCH5Zgrb7RMh9YwBWznmcwjxwv1uOaxr BgpQ== X-Gm-Message-State: ANhLgQ2COaCMHwIgMpMW54Wx/xTRy7QnIlT929bBzqssHjQySDgEyYmW q6zYl/PQMxieUqf5dYJnl6SriYh+XcxWhA4fZkmkQW++ X-Google-Smtp-Source: ADFU+vsv/Yn8z5yrGgLn5m4n+dCWsNZQ8ZX3QYGrKLhMQBTweegaHy6Uj2J0pgRH02HOLd9e1FiEh4EyPop7gZLi/LQ= X-Received: by 2002:a6b:400b:: with SMTP id k11mr3569824ioa.256.1583351590113; Wed, 04 Mar 2020 11:53:10 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Wed, 4 Mar 2020 14:52:58 -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: 48Xl142kwWz4TmC 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.66 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.94 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-0.94)[ip: (-0.02), ipnet: 209.85.128.0/17(-2.99), asn: 15169(-1.66), country: US(-0.05)]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[66.166.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; RWL_MAILSPIKE_POSSIBLE(0.00)[66.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: Wed, 04 Mar 2020 19:53:14 -0000 On Wed, 4 Mar 2020 at 03:33, Ed Maste wrote: > > 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 r300828 branched (only) usr.sbin/bhyve/ to the top level directory, which is represented in the git conversion as deleting everything else. It's this that is the root cause of the git subtree trouble, I believe. The actual changes come in r300829, merged in r302332. Uli, do you think we could just omit r300828 (and r300829) from the svn2git conversion? This is a slight revision to the actual history, but I think no information is really lost -- the merge in r302332 includes the full commit message of the only change that was made on the branch. I do not believe there are other branches made in a similar way to r300828 (copying just a single subdirectory) but am not certain and am trying to verify that now.