From owner-freebsd-git@freebsd.org Sat Apr 24 15:00:48 2021 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 B4B776227E7 for ; Sat, 24 Apr 2021 15:00:48 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic305-20.consmr.mail.gq1.yahoo.com (sonic305-20.consmr.mail.gq1.yahoo.com [98.137.64.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSDqh2qqNz3GlJ for ; Sat, 24 Apr 2021 15:00:47 +0000 (UTC) (envelope-from marklmi@yahoo.com) X-SONIC-DKIM-SIGN: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1619276445; bh=ESJOMdefOsGMtxO/5dy4QsleGc+C0kcdcPMF0kP5Hyt=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=XyXdqWTSgYyXeRT2UQzlQmce4kV1w+0S/WGUeBGbgdWZwP6Z2wMALex37QxBs4+1y00acFxGvE0xjDnLAvIyTQ4LzogY7oq48u41LhBrp/zcg00uuuHE+862dXtr+Ei4P5d+9Nu5kzdDHegy9XQ4Hk1q8LD3UYaSSzXHwBAphrLY7wkQlXb5kM7rdBbrsTffQSDtFwz2d+ut3VneWKp8uUlGh3e+6v/Xc2o/L43d7Lgbrx9G8+3vukhOAetIrPRlOxuwiC3prTUzefrRVHiVHOSDxRb5w4MRsfSCT50E+NuiamgcrGLKYLikjSXd+6g+D2t8Xq+rR5udMfun+mkuyg== X-YMail-OSG: 7PSj96IVM1nbfJWI44upfKxj3pRVYOuWWuNMm5FcmTavN9YTk_QROheb5xKcH16 HaQWMaETjDSWvcB4fNG1erTRhVJu_jsSwVopCF_ups4g2JWOmDpiA6UQYoWZMhDTMkE2iI4j3mhg wBkBvGBJpXEvyW5GQurXIIGFB9MU6mfYG7ow41zXDPebyY8iNfMxI81IlsH04GnDQXzZrIPF2Hd4 p7U6kqTbyEBkz4HF1SP1LS7_LK9iL6AFQKxBMGvVc0V3tAoE1U_aPz5YlmjbR0KwX_uHecXej0xC Vd5IV6IkGGRzf9DErhzAF5qLj3t7YQvB1Vw07kOSSitQlMQGjEG_unLjKA.GKaw8kEW45y2opGnJ T8ucPoHkjequMJsIIqmxWe3SQDuVa8u7p60aPrXQ5Wjasmz_s8CZ2KM2A8jLBBrNwypw5MQsO4Xi vrPGr43.lrBcbDyNlYHB79qM.nihmpQ2uF7j9WNAYM9hARUY.ocIbrKyr460lBTz9gvQrlRwJahq xspQWEeFlB5Y.jrkwoTe4iJdIuRgJ0S6zxV5hKEDR9kmOa75xJEodt6z1r9guuwTJd0O40pZgEqf e2WZt9RsdvTAFgGFM4M_k0HEagypy_clDDVK6_Sad9KsjpRhqPyGfWuAh8x0FPFeAXWsqgEebw8u DCM7KdnGDISF1_IbtcYppYUPbb8gSM1cbougwAJslGy6dM0KGVWvKizVrzhYFSkBBQ1J13DIytOB dxD6Qs0ka4oX5S8o45GqcGWh02ONlcmZZDaLr91IUDSQaBkmp4bQaR6EbwQDRaKsmXev0uDAxMFv LwVEPoF7FzQqvMe7N7jOfQqU4m9nzA51ycPZE5ytS08Tpy5EJLxYxIn1x_ib1ZnwTcMCsRag0fvS J.vyonPRa3yoDM0YGTQZARol.mMWvbcBVSrm6tttA3xsbs5rTIRGQ4ExDMpperhNn8WrM20t3ui1 4PIwQ.DfCv8PXznEG9KthniMOyDFuQ3q8q4FWCMYi8aFODfRuiIwCXFM.VP8mFWN9hEDFCbHdygJ wRLLGvfiCCQQCaLn6_sTjjNtf_5e9sNuWbgs6dJo1m3cU9hKgbmbeJ.InqD7mPGxqeHdVRQvf661 HVrXL2cznyAixu_eLc02TMLZwelFIAe.71_AT0nrE2juPwwEqDmc6Cj2C9TL.nCK1mNnBTHo4PaO 7uhU4_vnOY6D0anLuCf.Kr4FNFsVcxjZITr74xvABfn6J6c8tiI9P8w.0D7J7GrBUuqq8wFaS5Ey WvJqpjt4RYo8AKmij6rTvSclDsr66vPL8XAD2YV.n8pqtjb6lC.C7pwViuxdZE_OqEl0temOhQ.I L82pJyQjweeMpX.OaMvkizpvO4iqFj9ilh48mveYpdRtqL2fkqp3ihdqVAgv16EKAeET7MNiIvz3 gQIbIymdjdGKUXEvBIpzrIeDbnfOZGw0Vtc_V47KrsQ2mU1esERUw8FW0SZr_iAZEDFnkEsgAe3Z ykXQWn1xrAKVcq0_x1VrKWELakBZhKvyE4IQiwnND_tGacL1DPhB0EGzDgidBcEiJNVmGcUt_EqX lF6KeOnt8h1P1B.dirDCcAo8H_X6pmVK4iG32S.0t6Wsv5_pTSfxCPDf2uWsJO5tNErMlEKZs2Re CPCJyx0WaskqOc6ENboCf_HkWa6QDvyb3WSutUs22zDpPP1niOGc16iiappTt.HI6pkktiqLlDr7 arIp_hXuBTH_Yuzu7_Wmh4Jq3onYE8aWF1OjiTizauFO08EeVq3r5VQoifcm6KK1xkeGgvaMrlK8 P1fknSzl_ZVishm.u1Bq4eGzz2hr17host1gcwTL36ABIb1cZdM45C6dXdgzQDYHpz3yh0mYRBWn AuwLWQsUW6WPINcDwnZQFPzUiljzp0acePE_AU.eiJ2_sZBFpxeVzqp_kSJM01HfeljXAMnf7_k_ mNxs4PtZVyEBkSJR2DYPIXAa4NyFquEfNI7SQrFFkSHc0jGmyfzD4ysZnFKdQ4RuL0z35W78sd6n XtEXEkcDOLFEZY7TQLxK6gI.IMxG0tftYzc5kpfsT133Kd24hN8lLs1p7UAqLiIskS950J6b992C wgeTmnunarRFENNNVABN2mggglG4Efex9LcF5mzKy55Cm3_Md8f172uDPFlPhDK.nr0b3HolwB_H rOBrBcykpynPayoHgAvp9jEXrwj.pMjlcr3qbBhqXizfi.5cKn5s5QlQd.zBrCeMwVCjYUQpS3OC yOe2yvJxW4GeXJW7.5yTRVNxWlLWdwG22LdjQLA9BrP78eEZ4nHFpD7mRihiDhqGAKl1fcE9MwDP gTIQqh8uUF1kP_EPeoZ0vp5DAsrz16QaR9svsJhHr2iEbP9nkAsBlBWz40JDKLH3emwWMVQCYtYb iFUcLBWmPehRRp91Uw83.bqYil6KhSGeRcdctevvImGstkPcqgY128pNRarnjG56GcQEQDT8slEt VBA5TYcgyjRj96j.XhMTa8kEPCtlyStyZZP6hOHq_RsEIeX0G58YIKrXCmgnYf67U1nluDTe2OUv f4N6MG9rG6P0b X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic305.consmr.mail.gq1.yahoo.com with HTTP; Sat, 24 Apr 2021 15:00:45 +0000 Received: by kubenode532.mail-prod1.omega.bf1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 076f820390c7d7b42938ddd7fad9406c; Sat, 24 Apr 2021 15:00:40 +0000 (UTC) Content-Type: text/plain; charset=utf-8 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: vendor/illumos merges From: Mark Millard In-Reply-To: Date: Sat, 24 Apr 2021 08:00:37 -0700 Cc: Mark Johnston , freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: To: =?utf-8?Q?Ulrich_Sp=C3=B6rlein?= X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FSDqh2qqNz3GlJ X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: freebsd-git@freebsd.org X-Mailman-Version: 2.1.34 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: Sat, 24 Apr 2021 15:00:48 -0000 On 2021-Apr-24, at 03:44, Ulrich Sp=C3=B6rlein = wrote: > On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: >> Hi, >>=20 >> Now that FreeBSD uses OpenZFS as the upstream for ZFS, vendor/illumos = is >> mostly unused. However, we still use illumos as an upstream for CTF >> tools and DTrace, though there haven't been any imports in a while. >>=20 >> illumos has put a lot of work into their CTF toolchain, and I'd like = to >> import that. There are a couple of snags that I'd appreciate some >> guidance on. >>=20 >> First, I believe I should delete now-unused ZFS code from the vendor >> branch and merge the result to main. I did this locally and got an >> empty merge, which is what I'd expect. Is there any problem with = this? >=20 > Why would you record this empty merge? If you clean up vendor/foo, = just do that but don't merge a no-op back into main (nothing changed, = after all). >=20 >> Second, with Subversion we had both vendor/illumos and >> vendor-sys/illumos, and now we just have the former, seemingly with >> sys/* bits imported from vendor-sys. Some of the upstream commits = touch >> both userspace and kernel bits, but the merge targets for these in >> FreeBSD are different: cddl/contrib/opensolaris vs. >> sys/cddl/contrib/opensolaris. How should I merge into main in this >> case? I don't really see any options other than to split each = offending >> upstream commit into two parts, one for userspace and one for the >> kernel, and merge them separately. >>=20 >> If it helps to look at the branch where I staged the upstream = commits, >> I've pushed it to vendor/illumos2 in = https://github.com/markjdb/freebsd >> . >=20 > Can you clarify why the merging of the two might be an issue? Note = that unlike subversion, in git there's no "merge a certain subtree" = handling It might be an ambiguous terminology context for what is being referenced, but there is : # man git-subtree GIT-SUBTREE(1) = GIT-SUBTREE(1) NAME git-subtree - Merge subtrees together and split repository into subtrees SYNOPSIS git subtree add -P git subtree add -P git subtree pull -P git subtree push -P git subtree merge -P git subtree split -P [OPTIONS] [] . . . Its usage has tradeoffs from what I can tell reading about it as an alternative to submodules. There is also a not-predefined-in-git alternative: https://github.com/ingydotnet/git-subrepo#readme > , all that is recorded is a tree of some form and then a set of = parents or ancestor commits. (git is a content tracker, not really a VCS = :) >=20 > I was under the impression that userland and kernel imports/merges = need to happen at the same time anyway, so I assume you would import all = the bits under vendor/foo in 1 commit and then merge them in 1 commit = into main. Is that not how it goes? =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)