From owner-freebsd-git@freebsd.org Sun Apr 25 21:27:40 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 A3BA05ED0FD for ; Sun, 25 Apr 2021 21:27:40 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-qk1-x72f.google.com (mail-qk1-x72f.google.com [IPv6:2607:f8b0:4864:20::72f]) (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 4FT1Mc41Swz4f69; Sun, 25 Apr 2021 21:27:40 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-qk1-x72f.google.com with SMTP id e13so44926280qkl.6; Sun, 25 Apr 2021 14:27:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:content-transfer-encoding:in-reply-to; bh=AkbwOSJmJXM80FGiZTyTnDENxQikPZXjJw/EINX1LXo=; b=qRM/1aFVVEYil1D3dFu/jjFi/ZTJ/CNM+Mm0IVEBBJ0U9hozONzbn/XqTuTukDlizP 1LrcxUhSVi3HJD6FEs3M5EsuysMOe2KOM9pMF7Vr0dAP1A7QpHn5sS0UJ/D3g02r32nL 1utwxtOURnfo4/S18Yg610HKujpReRBGuAZ6HonXOHqHGX/r5lVrkYrgaWXuwpqVwzc+ Cd01t729NYyDGkCmJrzui2j+PVBsdxJ5OnU2EuO6t2GCURr2XGKf2YKmg/1xyH0l3xTz VDzjFFNRSNg2d7Hgqjq+ZBBfr6ED8NiTiHjcmFjwLIe+Ja9HuAyvBNYSj31iYH0/iPBi G9iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition :content-transfer-encoding:in-reply-to; bh=AkbwOSJmJXM80FGiZTyTnDENxQikPZXjJw/EINX1LXo=; b=A5k/raS1N/7Oq72lOhcpn4zQsSYkUyd9c5E2EffURTutbH0ivJHc6spaN9/2XWDQy+ kINDctFdn6oBtZHDQeDrKkzhYCTGBkPAw+7BjnsrIaAMZ1VnUDN+oCmS58iFb7aNHdq8 WjIrV7LLmhBngshz9j4o1SKE/DxCIN5SB4rIPyiC3UTWu7JKeUsGBzgHKK1gJPwYEqA2 Q071f7rHoORXh2VVJNv8tXQliUmaK8UJLVvBcN+Go2HtZkkaTPJGF8qiqAC0vwxqbJSe Zj6sjGerd6kCBC2ZsHQEKxaSMcsYuvqKhPAauilNedAXYzepEHe0Bj0GRfJ1npynRsk3 cSIA== X-Gm-Message-State: AOAM533NQVB+IVx6B1PldP6UJYVWGQInzBqEimTlBuamlEo7XH46abMi 7hjTY5E7qUA0YE+FOPJwOCOh+qVn94KnqQ== X-Google-Smtp-Source: ABdhPJzWxSKm6rrxqlDCMjO/TrkV49H0IXz+Ldw6Og5PA/Cj4j+xOJQTBHDbdzLMzpdzK8Rk7Cq2IQ== X-Received: by 2002:a37:8bc2:: with SMTP id n185mr14604373qkd.320.1619386059138; Sun, 25 Apr 2021 14:27:39 -0700 (PDT) Received: from nuc ([142.126.164.150]) by smtp.gmail.com with ESMTPSA id q125sm9213417qkf.68.2021.04.25.14.27.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Apr 2021 14:27:38 -0700 (PDT) Sender: Mark Johnston Date: Sun, 25 Apr 2021 17:27:38 -0400 From: Mark Johnston To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: freebsd-git@freebsd.org Subject: Re: vendor/illumos merges Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: X-Rspamd-Queue-Id: 4FT1Mc41Swz4f69 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none 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: Sun, 25 Apr 2021 21:27:40 -0000 On Sun, Apr 25, 2021 at 04:02:22PM +0200, Ulrich Spörlein wrote: > I don't think you want a subtree merge, especially as things are > scattered all over the place. Also note that none of this subtree magic > is in any way recorded in the git data, all it does is help you with the > 3-way merges (or whatever). > > So I would do: > - import whatever you need into contrib/foo, commit normally. > - munge /usr/src to have every kernel and userland stuff (not sure what > other merge tools exist, just make sure to copy over file deletions as > well :). You could rsync --del two times with the right source/dest > pairs, or export a diff/patch from step 1 and apply it under the right > prefixes. test, test, test. > - write out this tree to git using: git write-tree > - then commit this using: git commit-tree -m "my message" -p HEAD -p > origin/vendor/illumos > - bump main to point to that hash using git update-ref > - git log --graph and inspect the hell out of this > - git push, then curse that we disallow merge commits and you need to > `git pull --rebase` to advance to the latest published head and that > might mess up your merge commit pretty bad :( Thanks, I'll give this a try. I need to make quite a few changes to various base system files not included in the import, makefiles mainly. Presumably these changes should be included in the merge commit? > Maybe 2x git subtree merge + then rewriting and squashing them into 1 > would work. But I fear it will record 3 parents, not 2 parents. > > Whatever you do, maybe please push to your private Github clone or our > dev repo first and tell us where to look, so we can inspect whether it > looks ok.