From owner-freebsd-git@freebsd.org Wed Mar 4 22:32:32 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 1327725413C for ; Wed, 4 Mar 2020 22:32:32 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f44.google.com (mail-ot1-f44.google.com [209.85.210.44]) (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 48XpXt5cKvz4G6l; Wed, 4 Mar 2020 22:32:30 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f44.google.com with SMTP id x19so3723993otp.7; Wed, 04 Mar 2020 14:32:30 -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=Q1mF/CTm52QkdT6eGeseoUt4U5zSro9zusfUPEigRj0=; b=hrJeGus4yc3Go2DQIkzRcl82D4ckTPa+qPNJRYVvLxfYnNWMuS9mDQweOlql/MeWMY LmS2E3qBzoOoIVpxTgfwox1yQ9Nud25DIz2iepCMbz3GLosGXb+y4mqmxwFTqmJDdnAX wLVKTAwRwzO3ud99yl2ox1HU1fOi/JaleBk1/XqXYpPpVUhdh39VdKjYi3Rcps65ZeTr 53XWDbK0DAHJaYPx/iGxWQtDiUvXz2WiMkCF+qL7CLNDpTy7fMnBaC6B0/671LiwYJk/ PgtiV7FbsV6VMz7LfNlwI/qZeRabhi7zaEY4y4OJNAz/PTn9mwt3zMBVspGf5YdZp7Hz 2gSQ== X-Gm-Message-State: ANhLgQ0U0vg+UFJOgMU6+rfcDVI1rkXUZ9cOyiW1GBTuTI238O5gURWx cqJaYQQEV002CV0yerJ7yLXdcAe7qmEvxHRyfN/6iA== X-Google-Smtp-Source: ADFU+vsvTE0Ti7vTd1RBHUbIHTTa+PUSMRku1g2Zka7lf+pHsQ2LMXTyMknilx/xfDV8/rHgKIff09U5qyJ+VUBSVm4= X-Received: by 2002:a9d:64d8:: with SMTP id n24mr3882389otl.71.1583361149009; Wed, 04 Mar 2020 14:32:29 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Wed, 4 Mar 2020 23:32:14 +0100 Message-ID: Subject: Re: Another svn-git oddity To: Ed Maste Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 48XpXt5cKvz4G6l X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.44 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-3.01 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; RCVD_TLS_ALL(0.00)[]; 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)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; RWL_MAILSPIKE_GOOD(0.00)[44.210.85.209.rep.mailspike.net : 127.0.0.18]; IP_SCORE(-1.01)[ip: (-0.34), ipnet: 209.85.128.0/17(-2.98), asn: 15169(-1.66), country: US(-0.05)]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[44.210.85.209.list.dnswl.org : 127.0.5.0]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; 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)[uqs@freebsd.org,uspoerlein@gmail.com]; RCVD_COUNT_TWO(0.00)[2] 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: Wed, 04 Mar 2020 22:32:32 -0000 Am Mi., 4. M=C3=A4rz 2020 um 20:53 Uhr schrieb Ed Maste : > 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'l= l > > > 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. > SGTM, I've added these to the exclusion list for the next incarnation. > > 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. > Can you check this in programmatically across all branches? Cheers Uli