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. 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. From owner-freebsd-git@freebsd.org Wed Mar 4 20:00:31 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 E9FF827749F for ; Wed, 4 Mar 2020 20:00:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f180.google.com (mail-il1-f180.google.com [209.85.166.180]) (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 48Xl9V6f6cz3K3K for ; Wed, 4 Mar 2020 20:00:30 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f180.google.com with SMTP id q13so2910279ile.8 for ; Wed, 04 Mar 2020 12:00: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:from:date:message-id:subject:to; bh=ckezUMAp/sAa3zx7I9Kr3avitEQ6rk+Ko5fHIK0ln/Q=; b=UAS/fUh7Q1rP4qm6JenUvxB80RuYMIhTZh5K5lcyQRR3zus78R/NC9Xwp6yId2nLyU mR9BclvMysG0Z//nw8J/c9KEs58+nDM1yxlfw8mUqZAGjf6hMzSRLwqYkStnyZ8KK/fV yyRZ48k57TgYsB74/wONr8FyTRQlI5pdcaUUZMBSGsofFmC0IKqsnYcxE8hAf4agYdAh Q8K5Prgyq0rcpZs3RCkuDy16QHpG2uEEPnrUe6uEWQG8VIsxlg0zgFAgKClxKUcnj0Y+ C8x+uiOKfrg05XxGPkb9s8oCKq07tlCFUpjXC0t9HN3RfwsZraRyRH7v45oz2oGqAUT2 LrsQ== X-Gm-Message-State: ANhLgQ0ujR9jlSVj95QIzJ8DJvi9s9idt6J6f9dimiz8TOcATv+NdVMP lfLalghf9cjRvH1S18iyz+uZQyf2XSq7GSA+/YqtnUZ/NBM= X-Google-Smtp-Source: ADFU+vvaphxg8wIkCcyhEPzeBjhmSXVhkZnb8LyyluZCX+/tAdpwSMkHEo6mxSRHcpIbe1Y1vVcM5a62hU73SGsttWc= X-Received: by 2002:a92:d34f:: with SMTP id a15mr4134148ilh.182.1583352029258; Wed, 04 Mar 2020 12:00:29 -0800 (PST) MIME-Version: 1.0 From: Ed Maste Date: Wed, 4 Mar 2020 15:00:17 -0500 Message-ID: Subject: More FreeBSD repo oddities - commits as root To: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 48Xl9V6f6cz3K3K 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.180 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-4.23 / 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]; 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)[180.166.85.209.list.dnswl.org : 127.0.5.0]; IP_SCORE(-2.23)[ip: (-6.44), ipnet: 209.85.128.0/17(-2.99), asn: 15169(-1.66), country: US(-0.05)]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; DMARC_NA(0.00)[freebsd.org]; 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 20:00:32 -0000 One other oddity that came up during git conversion experimentation is that there were a number of commits in 1993 (in CVS) done as root. delphij@ provided this list: > Affected svn revisions: > 282, 281, 238, 119, 90, 89, 88, 86, 85, 84, 83, 82, 36 For the git migration I don't think we want to do anything special with these - just leave them as root, as we did in svn. If any folks who were involved in 1993 know who did this work it would be interesting to note it, but I can't imagine it's worth trying to revise the history. From owner-freebsd-git@freebsd.org Wed Mar 4 21:20: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 3D0B2251F1C for ; Wed, 4 Mar 2020 21:20:33 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72a.google.com (mail-qk1-x72a.google.com [IPv6:2607:f8b0:4864:20::72a]) (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 48Xmxr04N3z4Yqs for ; Wed, 4 Mar 2020 21:20:31 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72a.google.com with SMTP id m2so3178769qka.7 for ; Wed, 04 Mar 2020 13:20:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=b4scCM3lWf9jTg47uiyN34GMBc3a+33VWfR0VvWA1pg=; b=N9+LA966WYnYea+y2TR1vpZKSY1KNAn0t941xSQejbpTMPZxYe/z4sXWfFjgxgM3XN Pkal6rw2FeGNWm/p8jG7lGEcvpFB75qLEjb8A6+npVWe/s/8w6vvKvmjTn0tE7W0FATV 963ia8nop2t/sKk8kGFHqbV4TgTnfUuV4b/8RwWG+SLz8nG7UuTpXigMUL6AsO3xkkZ5 qqhT729E9NDGnkfRILKJ2Bu3ceVvBZP7tu2LbWIn58iRM35wq6xM6u/6O2nF/QFeMmjO GFySm5CQAKfm/Dn8PgbBAZfYstbiAMGOs9SzN1QJA85fdgetLhiDTBeKnzxKseXPCAq6 ZEog== 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=b4scCM3lWf9jTg47uiyN34GMBc3a+33VWfR0VvWA1pg=; b=rPHJtoOdLk/a4IJ2r3vZ01HpEgBJdH9Y8nN16TZG9/CvZr5yWdzOuDik5BmYek3g34 KHG+MVP9WTd3AynkzSIhUWYaD/8DAvI/I9Ry09j2I3IS26DHNk7XzFm6QKYmR6kBQUQ+ uBGJ+2Kk/1tDz+k0LXX2PFe6VYdVzxMx9omjbFdXkrVrM6O+b0jSfzvKyBKlDg51Es0C 4TWomL0LSUqbG70WuYl+lEcc8glO4IB29ICuYnGeg6hjO5icfpdcyhIEoq84yb4HXK5q T73+ALchtbrlxeotmyWV417VBP2Z2WfXg+141ECqpduVk9MSh2YwyT7H+Ji25pn7g8/A LQJw== X-Gm-Message-State: ANhLgQ3a0yJ8iIgjzk3yZIXBnxmsKv9JHzp5yqo7SfzfKWNbZSGsELhk 6PvfyDFX8zf8GI/AeA6ebbe1jODmgXpZIpdi2pvhGQ== X-Google-Smtp-Source: ADFU+vsuKeshkPLp3W2BDC0p0Rav0+D76surabA7jpyYAJgxtlg3wzK2Qf2lQsYCVNfU35EM2+Hf9JnZrq/lQbWZh7U= X-Received: by 2002:a37:4548:: with SMTP id s69mr5095123qka.60.1583356830067; Wed, 04 Mar 2020 13:20:30 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 4 Mar 2020 14:20:19 -0700 Message-ID: Subject: Re: More FreeBSD repo oddities - commits as root To: Ed Maste Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 48Xmxr04N3z4Yqs X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=N9+LA966; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72a) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-4.56 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[a.2.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.56)[ip: (-9.23), ipnet: 2607:f8b0::/32(-1.86), asn: 15169(-1.66), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" 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 21:20:33 -0000 On Wed, Mar 4, 2020 at 1:00 PM Ed Maste wrote: > One other oddity that came up during git conversion experimentation is > that there were a number of commits in 1993 (in CVS) done as root. > > delphij@ provided this list: > > Affected svn revisions: > > 282, 281, 238, 119, 90, 89, 88, 86, 85, 84, 83, 82, 36 > > For the git migration I don't think we want to do anything special > with these - just leave them as root, as we did in svn. If any folks > who were involved in 1993 know who did this work it would be > interesting to note it, but I can't imagine it's worth trying to > revise the history. > I'll make inquiries. Warner From owner-freebsd-git@freebsd.org Wed Mar 4 21:32:19 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 D085A25279E for ; Wed, 4 Mar 2020 21:32:19 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (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 48XnCP67kQz45xg for ; Wed, 4 Mar 2020 21:32:17 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x731.google.com with SMTP id m2so3212707qka.7 for ; Wed, 04 Mar 2020 13:32:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=1fsYFCmhE0ByY/QntkWlXRnrjpcEFVTNOIXK7BMbRwA=; b=Oc6AOku4kMXXBsNdJR4zx6XdMMOAf9sS/lkYJpWitMlPYtzgdzO38iAcb4kXw8aGXB 61qQX1qnOWP9TRKtZZ1Wlmew44UNhWKL1cV2aF4p0OwcVu9tLEGNvGEvKgROdgB4HEvM pYWa4okETb7Zeeg3txwQ/eQGyZGYDEet+BXgBWwIFIdIBICHJhpW2Ermo/aiHpKIV/oO fDJn2n1lEfc1x347yzQfH8Bj99a67aI/rLXQuU0WRtG9lCt93H8dH49RUmUvjJ6f8JLY hg0w4yCt39P9XwNsEMpElnyOn90JS9YUsunlAjCPfdY8wi2tFazxvCOx8ocBduQuu4NE NDzQ== 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=1fsYFCmhE0ByY/QntkWlXRnrjpcEFVTNOIXK7BMbRwA=; b=XBoPiIAdrJV6hRe+ecpY2dYaMtWRQagqh6GENsVv/2KacOO89CRtMGB7o1erZ3Bp8D 1UWRPkrVqrW7M31hT3iXCFwl23MN1wf1taB00/BACCgE4ks5Ijnksr2O67AiNgfONfLo zoJ16ewqm55Cn8SH7qTsfnVmpoQnIswi7ngcvhTd9XfZuNFETw67UT/4JHO2VJXzTGDp Qtt02ZO2uvwzUx2IoAv83bg6A3NAaCxxUvtw+HSUXS0G/vFsiu1g57Q7siVXGQusILQ0 DYtUobOcGmZcrxCjqw2C/1pXl2fxaeVPUz2IQhcZnJW+0o+6gg1LZcB+/Ax78Z6qLp9X AwHQ== X-Gm-Message-State: ANhLgQ1YghXjcL7yja7rQr0pS14YFMlFVBqLpqnv9uqVzY/rShcMe+53 ZAp/iRXxotO+4AkjOh7Sa4kZ6mlFOl4fIQoeMjTerw== X-Google-Smtp-Source: ADFU+vstWMaEPZGZ49OFnDf7Sy7M69PvkzfLa9IX4wlKVnHMZJoedrbb4O9FA8IyHCejHGHQmHObyNo4c3CkN8VdZE4= X-Received: by 2002:a37:a746:: with SMTP id q67mr3842021qke.215.1583357536799; Wed, 04 Mar 2020 13:32:16 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 4 Mar 2020 14:32:06 -0700 Message-ID: Subject: Re: More FreeBSD repo oddities - commits as root To: Ed Maste Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 48XnCP67kQz45xg X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=Oc6AOku4; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::731) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.54 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[1.3.7.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.54)[ip: (-9.15), ipnet: 2607:f8b0::/32(-1.86), asn: 15169(-1.66), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" 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 21:32:19 -0000 On Wed, Mar 4, 2020 at 2:20 PM Warner Losh wrote: > > > On Wed, Mar 4, 2020 at 1:00 PM Ed Maste wrote: > >> One other oddity that came up during git conversion experimentation is >> that there were a number of commits in 1993 (in CVS) done as root. >> >> delphij@ provided this list: >> > Affected svn revisions: >> > 282, 281, 238, 119, 90, 89, 88, 86, 85, 84, 83, 82, 36 >> >> For the git migration I don't think we want to do anything special >> with these - just leave them as root, as we did in svn. If any folks >> who were involved in 1993 know who did this work it would be >> interesting to note it, but I can't imagine it's worth trying to >> revise the history. >> > > I'll make inquiries. > phk thinks it was most likely jordan, with second most likely as Rod and a super distant third as David G, though that's starting to get very unlikely. I've sent email to rod and a facebook message to Jordan. The commits are https://pastebin.com/8trChU8v for a while... Warner From owner-freebsd-git@freebsd.org Wed Mar 4 21:35:02 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 BA686252837 for ; Wed, 4 Mar 2020 21:35:02 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x834.google.com (mail-qt1-x834.google.com [IPv6:2607:f8b0:4864:20::834]) (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 48XnGY2nmVz4CWF for ; Wed, 4 Mar 2020 21:35:00 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x834.google.com with SMTP id d22so2602432qtn.0 for ; Wed, 04 Mar 2020 13:35:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=l7hsA9yRmWJ4J94CgK6amHg9FOeLOzEXgLM6E1RQER8=; b=vyiOP1YYPlclf1J/bWTytzU0QIslmsIESomCfhGLDtcTVPgLAjhWGvWAXoRZn3qrqJ qgpL2gWj42TL4fyNOq1WP/ZirvA/J45I6x5ReZFrMTlxk2RoSIc+zdYivXnXsYVAgHw5 aQQhRvENBdRY0e/B2++zojIWXAJOeTGM4U/SJpzYlo32/xllbAbT5u6hpEA0nmi0sg5h YclppQY8CEvIcm6SA2lDTaWQLnjFZGZIoxK6KIaCtgZn28zbslY+pit/R0ln8+i6Ddip XlO6Wmyr2L5OMW34SVZjnzUg1I/J6mEDXXQVp1ZgUA9cd9i6hyMfQOhjUl42M7BrtS/n UnBQ== 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=l7hsA9yRmWJ4J94CgK6amHg9FOeLOzEXgLM6E1RQER8=; b=L8xkit8a+4lgAsQP26ktVPdHPcdrrY5AFQdX8xAm/Yyyf4wchNKHjbfgGNRuQDPWlW 4Sl5MWdceP4rDEjnxd/qVC6rx91qonH4jBWN0kyoDNxyS5XsXOaXd09mcA5XthsYwkSl szAFyycunymTKX6xCuzf1OWQN9cHWEvKkAApo73aS0Km52lEvdV75yPDlQ5WcnYpm6fJ ks+hgD8+CqCgjEOIqMUlqT4Y5QbyBI3KwMIzz3agzDz/VQI/M8lR+9jnIPqYP8Om2ffp pMOndNEgcEeCbgYZicOoHU7tPzHwHE8inrDiTNvmubfJd5CcpnlfjiwBGxUK/U8oih65 EfUw== X-Gm-Message-State: ANhLgQ2YNpyPW597KJ1TsVMnRsqabbvD4Al9ffukE8Qfs7pnGyjZ/B0o EtNrjHaaZSCihuuxvhExfzmMm4OYWlWRVV5MG1sO+Iwf X-Google-Smtp-Source: ADFU+vs+re6dQ+OEt53aPmbdmJoOE7xR1SXVPEw23RFeDTqlVLrnhN9l27qbGAsacl/2FTiufy0lCpg5RcHfLkUBCj4= X-Received: by 2002:ac8:fe9:: with SMTP id f38mr4316648qtk.291.1583357699628; Wed, 04 Mar 2020 13:34:59 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Wed, 4 Mar 2020 14:34:48 -0700 Message-ID: Subject: Re: More FreeBSD repo oddities - commits as root To: Ed Maste Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 48XnGY2nmVz4CWF X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=vyiOP1YY; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::834) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.57 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; URI_COUNT_ODD(1.00)[3]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[4.3.8.0.0.0.0.0.0.0.0.0.0.0.0.0.0.2.0.0.4.6.8.4.0.b.8.f.7.0.6.2.list.dnswl.org : 127.0.5.0]; R_SPF_NA(0.00)[]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; IP_SCORE(-2.57)[ip: (-9.30), ipnet: 2607:f8b0::/32(-1.86), asn: 15169(-1.66), country: US(-0.05)]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" 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 21:35:02 -0000 On Wed, Mar 4, 2020 at 2:32 PM Warner Losh wrote: > > > On Wed, Mar 4, 2020 at 2:20 PM Warner Losh wrote: > >> >> >> On Wed, Mar 4, 2020 at 1:00 PM Ed Maste wrote: >> >>> One other oddity that came up during git conversion experimentation is >>> that there were a number of commits in 1993 (in CVS) done as root. >>> >>> delphij@ provided this list: >>> > Affected svn revisions: >>> > 282, 281, 238, 119, 90, 89, 88, 86, 85, 84, 83, 82, 36 >>> >>> For the git migration I don't think we want to do anything special >>> with these - just leave them as root, as we did in svn. If any folks >>> who were involved in 1993 know who did this work it would be >>> interesting to note it, but I can't imagine it's worth trying to >>> revise the history. >>> >> >> I'll make inquiries. >> > > phk thinks it was most likely jordan, with second most likely as Rod and a > super distant third as David G, though that's starting to get very unlikely. > > I've sent email to rod and a facebook message to Jordan. The commits are > https://pastebin.com/8trChU8v for a while... > And if we can't find who, let's export it as root with the name 'El Rod Hubbard' :) Warner 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 From owner-freebsd-git@freebsd.org Thu Mar 5 19:05:31 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 C700D2491CA for ; Thu, 5 Mar 2020 19:05:31 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f170.google.com (mail-il1-f170.google.com [209.85.166.170]) (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 48YKvZ50dvz49K3; Thu, 5 Mar 2020 19:05:30 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f170.google.com with SMTP id o18so5986119ilg.10; Thu, 05 Mar 2020 11:05: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:content-transfer-encoding; bh=TJ9ImF8KuMVLArdUOuD9/6mukZcjRYy8MZUMukDlwOQ=; b=ml59giMRtc7kPXMDqXqqE52PjU+q5qI+aODJelybDy8WAhogiO5uX3TnHoa+ibMr69 UqyAJ9j0bVkAs83g7s9O+49KCs8PZ7I5jIyuXXZ6F7z1zD/QBTXDoo/lbCLRIPL0uJDQ ucWxYBz8RHh1ERdqo1lyukRP/xhtYwZmMkzzk+YCHwaqdc7509Ew7EzJ1x1hmL/XGAyf 59u9Sp3egxgnnQHVMwoy6o5YKn2rD6CRAAlzScY03sUCNZ/3O3QXRljL7mNlpm3czAL9 fOtWzn/BzS0ye0wfbp8nTdQFDhSsgG2SgLRlbPZWoPEUIeUI1B65rx3T2l1SE30TKu4f xfLg== X-Gm-Message-State: ANhLgQ1Nq1Ux/5auYc0VXlClttpKbGYySXjflkneXUz1p0cOM7QpHLQ4 ksGyKaeBszYTElR1QnjjjG476FNM+2XrZLlCbhIaZCF4 X-Google-Smtp-Source: ADFU+vs8khLSRQdHrB6W1As9ay0QryEc7czDDFDq61QUTG/l7hcmAzpcYqLe7kyCdfSL/IX3jQZ7jGeS7Od8Dbmo8uI= X-Received: by 2002:a92:4448:: with SMTP id a8mr428211ilm.256.1583435128420; Thu, 05 Mar 2020 11:05:28 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Ed Maste Date: Thu, 5 Mar 2020 14:05:15 -0500 Message-ID: Subject: Re: Another svn-git oddity To: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Cc: freebsd-git@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 48YKvZ50dvz49K3 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.170 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-3.84 / 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)[text/plain]; DMARC_NA(0.00)[freebsd.org]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-1.84)[ip: (-4.52), ipnet: 209.85.128.0/17(-2.98), asn: 15169(-1.65), country: US(-0.05)]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[170.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)[170.166.85.209.rep.mailspike.net : 127.0.0.17]; MIME_TRACE(0.00)[0:+]; 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_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: Thu, 05 Mar 2020 19:05:31 -0000 On Wed, 4 Mar 2020 at 17:32, Ulrich Sp=C3=B6rlein wrote: > >> 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? I can't be certain that I haven't missed anything but at least these revs are similar: r184052 (merged r186781) r205302 (merged r205471) r214084 (merged r234712) r300828 (reported earlier)