Date: Tue, 26 May 2020 14:20:44 -0400 From: Ed Maste <emaste@freebsd.org> To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= <uqs@freebsd.org> Cc: freebsd-git@freebsd.org Subject: Re: Another svn-git oddity Message-ID: <CAPyFy2CSw7vfacAz=b7yLYHeJ22Pz=XW9CWWMbbz0e%2Bv8QBe8A@mail.gmail.com> In-Reply-To: <CAJ9axoTo=YUwexpgGVuGWBvqL3ybanrQbrPEqpnRS1%2B31gVY-A@mail.gmail.com> References: <CAPyFy2A8Q=N%2BSS8=wOsfBtZ49QTUVXF2ZRYvUZX2dk=KyhKH-g@mail.gmail.com> <CAPyFy2DvaR5S6Vaz5JYKqyqGdPCaRg5Kyyn9aDb1EyXBqnA_Ug@mail.gmail.com> <CAPyFy2ApMj3pD8FwGeA5ahrcZS0JUvuBD306TDQdSstJQk9mbQ@mail.gmail.com> <CAJ9axoTo=YUwexpgGVuGWBvqL3ybanrQbrPEqpnRS1%2B31gVY-A@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
>> > > 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...
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPyFy2CSw7vfacAz=b7yLYHeJ22Pz=XW9CWWMbbz0e%2Bv8QBe8A>