From owner-freebsd-git@freebsd.org  Tue May 26 18:21:00 2020
Return-Path: <owner-freebsd-git@freebsd.org>
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 571192CFF7D
 for <freebsd-git@mailman.nyi.freebsd.org>;
 Tue, 26 May 2020 18:21:00 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: from mail-il1-f182.google.com (mail-il1-f182.google.com
 [209.85.166.182])
 (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 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 49Wj2L6FZrz4fNV;
 Tue, 26 May 2020 18:20:58 +0000 (UTC)
 (envelope-from carpeddiem@gmail.com)
Received: by mail-il1-f182.google.com with SMTP id v11so4098086ilh.1;
 Tue, 26 May 2020 11:20:58 -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;
 bh=B8vhYn/F4us3jc1hPza7HhifpMgTZ5pbacD9zov3T+s=;
 b=NfMYZVRzKaIpOTvCk7JjDOod2TGcD1ufU0n3GatgIHll+4DYElchoFtueoINgmCBtK
 FysBNN3yCsUgQaVr+zZdUuSp8nLJM8mjuyNdPi1zVUeWyA7vOOreHMa1OmN4dJtw6Pyu
 OK/xz+maQJgck0rxa4um/gwpA1KGBHuIoilVIbVfyjFXsatjjwAfrbRWhl9cANGFLUvr
 y7hkFbdVt8sI5GhoNrJVSitYBfRJ26jVnPztlMsqNW4j+IVvzskh16LlBcT3RNLtq/9d
 MdRH16g5R+YdalAi5QQ4X4BcvxF8Qha2Qw/q/iXBXnz+t42rGojhOIeTIwv7pXkaF5XE
 e18w==
X-Gm-Message-State: AOAM5334iP8vQqJCUj8u7cYLuG55IcTmqKMLHApkLK7HFxCVUbS2WoHa
 EcZMrpiwatl5dDY3kySXOlvl4NJKh2NuprOUNF/hcLZ7Qjc=
X-Google-Smtp-Source: ABdhPJxTLI53GCwMIUEm5Fv8fzLDQIGdbSA7DId9n0pKM574QzUalLS0P+G8NEPqDMZMjzPKmmNYhln5Vw8wQ18TB1Y=
X-Received: by 2002:a92:c952:: with SMTP id i18mr2485861ilq.100.1590517256408; 
 Tue, 26 May 2020 11:20:56 -0700 (PDT)
MIME-Version: 1.0
References: <CAPyFy2A8Q=N+SS8=wOsfBtZ49QTUVXF2ZRYvUZX2dk=KyhKH-g@mail.gmail.com>
 <CAPyFy2DvaR5S6Vaz5JYKqyqGdPCaRg5Kyyn9aDb1EyXBqnA_Ug@mail.gmail.com>
 <CAPyFy2ApMj3pD8FwGeA5ahrcZS0JUvuBD306TDQdSstJQk9mbQ@mail.gmail.com>
 <CAJ9axoTo=YUwexpgGVuGWBvqL3ybanrQbrPEqpnRS1+31gVY-A@mail.gmail.com>
In-Reply-To: <CAJ9axoTo=YUwexpgGVuGWBvqL3ybanrQbrPEqpnRS1+31gVY-A@mail.gmail.com>
From: Ed Maste <emaste@freebsd.org>
Date: Tue, 26 May 2020 14:20:44 -0400
Message-ID: <CAPyFy2CSw7vfacAz=b7yLYHeJ22Pz=XW9CWWMbbz0e+v8QBe8A@mail.gmail.com>
Subject: Re: Another svn-git oddity
To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org>
Cc: freebsd-git@freebsd.org
Content-Type: text/plain; charset="UTF-8"
X-Rspamd-Queue-Id: 49Wj2L6FZrz4fNV
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.182 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com
X-Spamd-Result: default: False [-2.36 / 15.00]; ARC_NA(0.00)[];
 FREEMAIL_ENVFROM(0.00)[gmail.com];
 NEURAL_HAM_MEDIUM(-1.00)[-1.003]; FROM_HAS_DN(0.00)[];
 TO_DN_SOME(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[];
 R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17];
 MIME_GOOD(-0.10)[text/plain]; DMARC_NA(0.00)[freebsd.org];
 NEURAL_HAM_LONG(-1.00)[-0.999];
 NEURAL_HAM_SHORT(-0.35)[-0.354]; RCPT_COUNT_TWO(0.00)[2];
 RCVD_IN_DNSWL_NONE(0.00)[209.85.166.182:from];
 FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com];
 RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.182:from];
 R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+];
 ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US];
 RCVD_TLS_ALL(0.00)[];
 FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com];
 RCVD_COUNT_TWO(0.00)[2]
X-BeenThere: freebsd-git@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: Discussion of git use in the FreeBSD project <freebsd-git.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-git/>
List-Post: <mailto:freebsd-git@freebsd.org>
List-Help: <mailto:freebsd-git-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/freebsd-git>,
 <mailto:freebsd-git-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 26 May 2020 18:21:00 -0000

>> > > 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 still see these in the latest iteration, commits
e3850c874e5ffc0edae1887b21cb27b642de9161
08b39b4bc02e511188ff37159e33fd095c6b28ba
227b908653e891cdd4a26c40eeb078e4b138d16f

I'm looking at the converter now...