From owner-freebsd-git@freebsd.org Sun Apr 25 14:02:26 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 D3733623D3D for ; Sun, 25 Apr 2021 14:02:26 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FSqTt43STz3QBh; Sun, 25 Apr 2021 14:02:26 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: uqs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 2376D549C; Sun, 25 Apr 2021 14:02:26 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Sun, 25 Apr 2021 16:02:22 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Mark Johnston Cc: freebsd-git@freebsd.org Subject: Re: vendor/illumos merges Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) 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 14:02:26 -0000 On Sat, 2021-04-24 at 11:08:58 -0400, Mark Johnston wrote: >On Sat, Apr 24, 2021 at 12:44:40PM +0200, Ulrich Spörlein wrote: >> On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: >> >Hi, >> > >> >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. >> > >> >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. >> > >> >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? >> >> 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). > >Ok, I guess there is no reason to merge that change separately. It >will end up being merged with subsequent imports though. > >> >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. >> > >> >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 >> >. >> >> 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, >> 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 :) >> >> 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? > >How can I do that with git subtree merge? Suppose an illumos commit >modifies cmd/dtrace/foo.c (userspace) and uts/common/dtrace/foo.c >(kernel). That maps to cddl/contrib/opensolaris/cmd/dtrace/foo.c and >sys/cddl/contrib/opensolaris/uts/common/dtrace/foo.c in FreeBSD, >respectively. So to do a subtree merge, I need to use distinct prefixes >depending on whether I'm importing userspace or kernel changes. When >they are mixed together, it's not clear to me how I can merge at all. > >I see that for OpenZFS we keep all code, including userspace code, under >sys/contrib/openzfs, so it doesn't have this problem. 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 :( 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. Thanks Uli 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. From owner-freebsd-git@freebsd.org Mon Apr 26 12:31:20 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 9009E5FE7F2 for ; Mon, 26 Apr 2021 12:31:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTPQJ3mLKz3KrH; Mon, 26 Apr 2021 12:31:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: uqs/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 26F1DFADF; Mon, 26 Apr 2021 12:31:20 +0000 (UTC) (envelope-from uqs@freebsd.org) Date: Mon, 26 Apr 2021 14:31:18 +0200 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Mark Johnston Cc: freebsd-git@freebsd.org Subject: Re: vendor/illumos merges Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/2.0.3 (2020-12-04) 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: Mon, 26 Apr 2021 12:31:20 -0000 On Sun, 2021-04-25 at 17:27:38 -0400, Mark Johnston wrote: >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? I think so. If all the changes are supposed to be visible to clients (and CI infrastructure) in one go, then 1 visible commit for this on main seems to make the most sense. Let me know if you need further help in wrangling the state of your checkout into a sensible commit :) Cheers Uli From owner-freebsd-git@freebsd.org Mon Apr 26 12:52:07 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 E89585FF69F for ; Mon, 26 Apr 2021 12:52:07 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FTPtH6HV2z3Lj5; Mon, 26 Apr 2021 12:52:07 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: from mail-qk1-f172.google.com (mail-qk1-f172.google.com [209.85.222.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: kevans) by smtp.freebsd.org (Postfix) with ESMTPSA id C4281205DB; Mon, 26 Apr 2021 12:52:07 +0000 (UTC) (envelope-from kevans@freebsd.org) Received: by mail-qk1-f172.google.com with SMTP id y136so24175648qkb.1; Mon, 26 Apr 2021 05:52:07 -0700 (PDT) X-Gm-Message-State: AOAM530GXyuw3RKUQNhlYZu9AgYqOP+ERX/BqNoCvvhO0tSEV5rjT2OT xEyVHUazQ+L0f/bohAthXPjSSYL3YE/bZH6vuDI= X-Google-Smtp-Source: ABdhPJx1+22ZweGW6IPrb3BZCOG+d3EkKM0IF0zN2LKCDBa6eoaf+BcvRhI9K3RXExMyjFWPbsQs+oXn3Z9jWaet7J0= X-Received: by 2002:a37:de14:: with SMTP id h20mr17149984qkj.34.1619441527200; Mon, 26 Apr 2021 05:52:07 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Kyle Evans Date: Mon, 26 Apr 2021 07:51:54 -0500 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: vendor/illumos merges To: Mark Johnston Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , freebsd-git Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: Mon, 26 Apr 2021 12:52:08 -0000 On Sat, Apr 24, 2021 at 10:09 AM Mark Johnston wrote: > > On Sat, Apr 24, 2021 at 12:44:40PM +0200, Ulrich Sp=C3=B6rlein wrote: > > On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: > [... snip ...] > > >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 tou= ch > > >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 offendi= ng > > >upstream commit into two parts, one for userspace and one for the > > >kernel, and merge them separately. > > > > > >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/freebs= d > > >. > > > > 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= , > > all that is recorded is a tree of some form and then a set of parents o= r > > ancestor commits. (git is a content tracker, not really a VCS :) > > > > 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? > > How can I do that with git subtree merge? Suppose an illumos commit > modifies cmd/dtrace/foo.c (userspace) and uts/common/dtrace/foo.c > (kernel). That maps to cddl/contrib/opensolaris/cmd/dtrace/foo.c and > sys/cddl/contrib/opensolaris/uts/common/dtrace/foo.c in FreeBSD, > respectively. So to do a subtree merge, I need to use distinct prefixes > depending on whether I'm importing userspace or kernel changes. When > they are mixed together, it's not clear to me how I can merge at all. > > I see that for OpenZFS we keep all code, including userspace code, under > sys/contrib/openzfs, so it doesn't have this problem. There's some level of precedence for userland build reaching into sys/ outside of OpenZFS, so if it makes life easier I would totally just blow away the existing structure to have a vendor/illumos that matches upstream structure and merge it all into sys/cddl. Thanks, Kyle Evans From owner-freebsd-git@freebsd.org Mon Apr 26 15:40:16 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 5B4DE5E56DD for ; Mon, 26 Apr 2021 15:40:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf29.google.com (mail-qv1-xf29.google.com [IPv6:2607:f8b0:4864:20::f29]) (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 4FTTcJ0j1Gz3mK6 for ; Mon, 26 Apr 2021 15:40:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf29.google.com with SMTP id j3so27414351qvs.1 for ; Mon, 26 Apr 2021 08:40:16 -0700 (PDT) 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=QtRGyZbw1ISQtF4A06zS/Li0y6xg42QfyIfKd0jZ6po=; b=zzRDb7hwY8/1ozIl1i+A7Il7U5dBxOrdQhJ/7QcQEgEKQ/0bD5GPNlOXLhGlu3eNjJ 4zjHKMmiLMJVDfcbPsbDtVwjhbZsScsY5oi/X17RwO2cw/d0ElYDi8jbZKy7ij2RH8sW Hy0FWWUZeXX8K8mcvQO5PlcQFyye+ozcVL/n09mCoAj0jenpdpP1pQxwicuC/rHTlrmN oSFt/WJH1+S0xmn/NnDTJlR1N+imlq5tJDmIbnS0GIAXAGSuWSO1gRiHYC+0xW0hz49M PLt8g7KYIM0UVYujB9d+i3+IznFlWgMFGZOClVpNhrodh0utgNP1JL72+YIcASTSedYk Kj3Q== 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=QtRGyZbw1ISQtF4A06zS/Li0y6xg42QfyIfKd0jZ6po=; b=G4IKm4z34bFEzidmfV4DE1HU2zH+LW0l2lx3PdRjMAatax4zIzm+AyPLJS6G41AW10 0X63OoagJHWJMRq+rs5AJizoEgdhAD86CnpGc5facEulTffH8off35yDVhoU6QG93KD6 oMGsBJ0HxWdxhfs6TWvHgH7bULhInNvRDl/XN3TCRTmtg+0MIoU/ysFNtvP2+f4lY0ES 4IahagR0rtxlpfaKI+9v4foL/ZUUmnjTXQjxz8q/qAduzLS4Ln5btdVo+211RnhjUEg9 KuqFXynswN/LGT95QqwQPjJLbHUdkfESDe9LYuB+G5lTEQdfYcW+K5kSV3ssCICGoK10 EC+Q== X-Gm-Message-State: AOAM532ZPhcGZtI+I2P5CoAv0FEanspRWOz402NnJ29bFuyc7TdRBPZE 88kHqOWuBOwUQpUrOkI9zsAdYQLM8Lf4FlSdy/VjJQ== X-Google-Smtp-Source: ABdhPJxuMJkitpOeTZTNnMpEHEVw5/DhbIfHUD+GG5znZBUJ+z1+3Rj9srcEFVRmYtE06bUOikAifa1N2JkoU1Js2cc= X-Received: by 2002:a05:6214:1866:: with SMTP id eh6mr18552266qvb.29.1619451614971; Mon, 26 Apr 2021 08:40:14 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Mon, 26 Apr 2021 09:40:03 -0600 Message-ID: Subject: Re: vendor/illumos merges To: Kyle Evans Cc: Mark Johnston , freebsd-git X-Rspamd-Queue-Id: 4FTTcJ0j1Gz3mK6 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Mon, 26 Apr 2021 15:40:16 -0000 On Mon, Apr 26, 2021 at 6:52 AM Kyle Evans wrote: > On Sat, Apr 24, 2021 at 10:09 AM Mark Johnston wrote: > > > > On Sat, Apr 24, 2021 at 12:44:40PM +0200, Ulrich Sp=C3=B6rlein wrote: > > > On Fri, 2021-04-23 at 17:26:33 -0400, Mark Johnston wrote: > > [... snip ...] > > > >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. > > > > > > > >If it helps to look at the branch where I staged the upstream commit= s, > > > >I've pushed it to vendor/illumos2 in > https://github.com/markjdb/freebsd > > > >. > > > > > > Can you clarify why the merging of the two might be an issue? Note th= at > > > unlike subversion, in git there's no "merge a certain subtree" > handling, > > > 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 :) > > > > > > I was under the impression that userland and kernel imports/merges ne= ed > > > to happen at the same time anyway, so I assume you would import all t= he > > > bits under vendor/foo in 1 commit and then merge them in 1 commit int= o > > > main. Is that not how it goes? > > > > How can I do that with git subtree merge? Suppose an illumos commit > > modifies cmd/dtrace/foo.c (userspace) and uts/common/dtrace/foo.c > > (kernel). That maps to cddl/contrib/opensolaris/cmd/dtrace/foo.c and > > sys/cddl/contrib/opensolaris/uts/common/dtrace/foo.c in FreeBSD, > > respectively. So to do a subtree merge, I need to use distinct prefixe= s > > depending on whether I'm importing userspace or kernel changes. When > > they are mixed together, it's not clear to me how I can merge at all. > > > > I see that for OpenZFS we keep all code, including userspace code, unde= r > > sys/contrib/openzfs, so it doesn't have this problem. > > There's some level of precedence for userland build reaching into sys/ > outside of OpenZFS, so if it makes life easier I would totally just > blow away the existing structure to have a vendor/illumos that matches > upstream structure and merge it all into sys/cddl. > libcam has been doing it since around FreeBSD 3 or so... Warner From owner-freebsd-git@freebsd.org Thu Apr 29 22:25:23 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 6D526637CF9 for ; Thu, 29 Apr 2021 22:25:23 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-ot1-f54.google.com (mail-ot1-f54.google.com [209.85.210.54]) (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 4FWVSL2JBKz3L8Y for ; Thu, 29 Apr 2021 22:25:22 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-ot1-f54.google.com with SMTP id f75-20020a9d03d10000b0290280def9ab76so57688016otf.12 for ; Thu, 29 Apr 2021 15:25:22 -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:from:date:message-id:subject:to; bh=F6BZQTUHmTVnzxO+Rfha2JcKEnvtxtzVdblQLurF85s=; b=gi24GoZgPwqfA60U2/xGdrnhNFbXgiE6+rUzToudAiVModj6zzhRLBn35Vs7SmQWX6 etVE8EQBAtHRjoh/92H2jUqc5RhXCOVOLuDiBmI/ZxOQcTHJyw6WO6SKuEKVQb8xMTk8 wVHxh4gBsE92j17wVFZQIapFou1i2uxUpW1KPWacr6S+XBiYyk8Tpd4FNPjWhdl1e59a Kv7Y0EXuJFbNRtngjP2wmWsrcOr69gQNYMo4l1gqfsgeJOx8JPMec3kcnjEXv0vyoGo+ LSxGdKqHb5wst+Eilwcwj1NKAN+LlbUAuAicGJnygtwX7XAJFHAvsz5AnAPsikvq55md nMRg== X-Gm-Message-State: AOAM533x9rJxnW35VYgbIxC34N2zhUR2P1J3CYZTfap1Vv0rye3k0/6C NHDAhARR1uajLo3UG25noOk/WrNPjwcylUzmpRt/cKM5Vi8= X-Google-Smtp-Source: ABdhPJy4f7ooGqw96TMLdqcU193S3+14767WiqPyaLQhoNfkgHyZN5+YyjdDDcdVPDRWCcOIcGaPTAzn1nuRVv+O61c= X-Received: by 2002:a9d:7290:: with SMTP id t16mr1061134otj.251.1619735120200; Thu, 29 Apr 2021 15:25:20 -0700 (PDT) MIME-Version: 1.0 From: Alan Somers Date: Thu, 29 Apr 2021 16:25:09 -0600 Message-ID: Subject: Migrating freebsd-update-build to git To: freebsd-git X-Rspamd-Queue-Id: 4FWVSL2JBKz3L8Y X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of asomers@gmail.com designates 209.85.210.54 as permitted sender) smtp.mailfrom=asomers@gmail.com X-Spamd-Result: default: False [-3.00 / 15.00]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.54:from]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FORGED_SENDER(0.30)[asomers@freebsd.org,asomers@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.54:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_NEQ_ENVFROM(0.00)[asomers@freebsd.org,asomers@gmail.com]; FREEMAIL_ENVFROM(0.00)[gmail.com]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FREEFALL_USER(0.00)[asomers]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[209.85.210.54:from:127.0.2.255]; R_DKIM_NA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.54:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Thu, 29 Apr 2021 22:25:23 -0000 Migrating ports to git was a big milestone, but there's at least one other repository that needs migrating. https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ is used to build official releases, and it's also used by people who have private freebsd-update servers. Or I should say, it _was_ used. It's orphaned code now. Could you please migrate it to git, too? -Alan From owner-freebsd-git@freebsd.org Thu Apr 29 22:28:22 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 EA6245E008C for ; Thu, 29 Apr 2021 22:28:22 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FWVWp645Xz3L6R; Thu, 29 Apr 2021 22:28:22 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: from mail-yb1-f173.google.com (mail-yb1-f173.google.com [209.85.219.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) (Authenticated sender: lwhsu/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id C2EF8EA7F; Thu, 29 Apr 2021 22:28:22 +0000 (UTC) (envelope-from lwhsu@freebsd.org) Received: by mail-yb1-f173.google.com with SMTP id g38so80587038ybi.12; Thu, 29 Apr 2021 15:28:22 -0700 (PDT) X-Gm-Message-State: AOAM532jP4Uo1Yho6Wi+UBgNlfLTQ7D3muQsTKJHAgrEtaCTBj31ysDE fGFxDmCKQHPD89cDpsAZ7oznT3V/W6IwnSEe3Z0= X-Google-Smtp-Source: ABdhPJzh78qDjZZ39S4acViJLh9whhWczqmFhuJjTIvUwYah2usC0qrqsgODHINeZXWWOWyk4Wtoj0wn6SwjDZM7Xec= X-Received: by 2002:a25:885:: with SMTP id 127mr2582311ybi.127.1619735302108; Thu, 29 Apr 2021 15:28:22 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Li-Wen Hsu Date: Fri, 30 Apr 2021 06:28:12 +0800 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: Migrating freebsd-update-build to git To: Alan Somers Cc: freebsd-git Content-Type: text/plain; charset="UTF-8" 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: Thu, 29 Apr 2021 22:28:23 -0000 On Fri, Apr 30, 2021 at 6:25 AM Alan Somers wrote: > > Migrating ports to git was a big milestone, but there's at least one other > repository that needs migrating. > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ is used > to build official releases, and it's also used by people who have private > freebsd-update servers. Or I should say, it _was_ used. It's orphaned > code now. Could you please migrate it to git, too? It was moved to: https://github.com/freebsd/freebsd-update-build But I think secteam needs to add 13.0-RELEASE config? Best, Li-Wen From owner-freebsd-git@freebsd.org Thu Apr 29 22:43:22 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 740AC5E033C for ; Thu, 29 Apr 2021 22:43:22 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-oo1-f44.google.com (mail-oo1-f44.google.com [209.85.161.44]) (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 4FWVs62lSyz3Lnb; Thu, 29 Apr 2021 22:43:22 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-oo1-f44.google.com with SMTP id i20-20020a4a8d940000b02901bc71746525so15066746ook.2; Thu, 29 Apr 2021 15:43:22 -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=pDtdP9BE7AtleMERC9d/Epg1qzinI3ICPbJgHAxL6tE=; b=paV+692SU+Y1p7C5jy1VCygwueCTFIZthEmWFHvWiLG5ugdOUYoo2rFfCOL4gZX926 HxGoGv4h+BukBSj4ywYwZfVSgq4yDefjh0U0hb0fcs1sayougzrgpTdpczMffJou7jqW rzQqPSywTWk9sPPSXNcgTknml2hFwvediNBxr0bzf/2hquZC+9+bi+Q0ZaqjgYUOLMpU NPR1nK3cbuh3VdjNauUpvbMQvJmBHeRE7wSaH6Zm+tdYZuyKVEanh7egH1K9x/szwKPZ pTTvtVHSUNTU4la0wFkj/3wVGEepT7Pqe/cuagy8CLbzuGiNTo4ak6qxslSsoiizVUpl URqg== X-Gm-Message-State: AOAM531nm2hedflTHdBzs68Mvb1WjgUGZkWv/zolkAOQNMoeffgbKbpw kE9iCKyUmW5a0ma2IdUv6OQlyIoGF/4SjJx7/c03xq0X X-Google-Smtp-Source: ABdhPJzDqtUxCcmEeWfW9fo6Hc77jQshozZdBRdNYRSU1KfIp2mwqHD8IyWfqAK/MAuM8CjhnaGV5a4es8D1mlRqVEU= X-Received: by 2002:a4a:8dd6:: with SMTP id a22mr1888754ool.74.1619736200641; Thu, 29 Apr 2021 15:43:20 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Alan Somers Date: Thu, 29 Apr 2021 16:43:09 -0600 Message-ID: Subject: Re: Migrating freebsd-update-build to git To: Li-Wen Hsu Cc: freebsd-git X-Rspamd-Queue-Id: 4FWVs62lSyz3Lnb X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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: Thu, 29 Apr 2021 22:43:22 -0000 On Thu, Apr 29, 2021 at 4:28 PM Li-Wen Hsu wrote: > On Fri, Apr 30, 2021 at 6:25 AM Alan Somers wrote: > > > > Migrating ports to git was a big milestone, but there's at least one > other > > repository that needs migrating. > > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ is > used > > to build official releases, and it's also used by people who have private > > freebsd-update servers. Or I should say, it _was_ used. It's orphaned > > code now. Could you please migrate it to git, too? > > It was moved to: https://github.com/freebsd/freebsd-update-build > > But I think secteam needs to add 13.0-RELEASE config? > > Best, > Li-Wen > Thanks so much! From owner-freebsd-git@freebsd.org Fri Apr 30 16:14:44 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 EA4606234E1 for ; Fri, 30 Apr 2021 16:14:44 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qv1-xf2f.google.com (mail-qv1-xf2f.google.com [IPv6:2607:f8b0:4864:20::f2f]) (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 4FWyBD07Xlz4tCt for ; Fri, 30 Apr 2021 16:14:43 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qv1-xf2f.google.com with SMTP id a30so7926514qvb.12 for ; Fri, 30 Apr 2021 09:14:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=ylfEscV5G+VmQVZgTmFgfPa6HXYizTuBBggIG2hxWBI=; b=Z+9rq34VoYAy/J6X7mE9gA+8wEKXWQyOvzkdFuTJ7qmiEm5T4//jVegb39HCk8QEsM QV+J2Wgob1LqirmKvofhKy7g9C+/fKrDaRfoYcHp5M7/9046CZBTbTeMgKMRw9rqLYVu 3JQN41v25lxw8EjWOPeKn1brF3dJQOtb8GqSdA3wOoYFwRnfoZf3KJuUw3vyuLQ+1ieS xovWZi8maWiyRC0b7yK+Icx/k179fTpbPn23E0hy1tTG0pTSL5hywkyiYycxtYyXiIND I88ZU5SO1UUK0QTle8l8q/4SXnn+Nl6s/fGrZwqqfRDfuR+rOkGqyL8WS4Y7g0KjzsLH FijQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=ylfEscV5G+VmQVZgTmFgfPa6HXYizTuBBggIG2hxWBI=; b=pB/6yyuucKSHopZUuL8iBfQhyKl8F9CmgNYpE34+JIyRg/h6r+QtaPrfBJlOBH7Cv+ m2FHjCEYJjdLuj0wDDrMVakuG73qEMSU+x6ZPqE1F5bzZxTgNdjH5vQ5DtVIJzXq9Uk+ ubTAG/171rCyLjQb2cz7YSZJirBmvZzOcO6DMKsMIgd2fVwlLEpVhxt7n6/ODK5qgCQB BMF2kysFip28S/BX0+B27qBUCryhLul7E1M6LnV2KCda5zP51MlBOPpLTKROLUH3kWSZ 1sqyxRX7EcfZ/QGLm4i1b8OF8Fg8lqG6YTFLz8bUkW9bmm+G3Ei2J0pHUmEZ5WU5IVBr E7mw== X-Gm-Message-State: AOAM530GnSSnv1MaUelpLcsYT1ytx7b/BRRIQAsxuxUJDUynq+UTK/uW y6IeQGqnAwmn9hVDRg/P92za2w== X-Google-Smtp-Source: ABdhPJy853fzDHFL02V2/IKj5+dBkpdeTfzYpAi7oHOMk/dstyrR/rRWl2J8BtvdFi5nWv/yhug13Q== X-Received: by 2002:ad4:5846:: with SMTP id de6mr6043211qvb.40.1619799281666; Fri, 30 Apr 2021 09:14:41 -0700 (PDT) Received: from mutt-hbsd ([38.140.209.219]) by smtp.gmail.com with ESMTPSA id m29sm1718660qkm.101.2021.04.30.09.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 30 Apr 2021 09:14:41 -0700 (PDT) Date: Fri, 30 Apr 2021 12:14:40 -0400 From: Shawn Webb To: Li-Wen Hsu Cc: Alan Somers , freebsd-git Subject: Re: Migrating freebsd-update-build to git Message-ID: <20210430161440.izytwpladqhtqyad@mutt-hbsd> X-Operating-System: FreeBSD mutt-hbsd 14.0-CURRENT-HBSD FreeBSD 14.0-CURRENT-HBSD X-PGP-Key: https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/blob/master/Shawn_Webb/03A4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="3cbzf3wdfurc3mvf" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FWyBD07Xlz4tCt 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: Fri, 30 Apr 2021 16:14:45 -0000 --3cbzf3wdfurc3mvf Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Apr 30, 2021 at 06:28:12AM +0800, Li-Wen Hsu wrote: > On Fri, Apr 30, 2021 at 6:25 AM Alan Somers wrote: > > > > Migrating ports to git was a big milestone, but there's at least one ot= her > > repository that needs migrating. > > https://svnweb.freebsd.org/base/user/cperciva/freebsd-update-build/ is = used > > to build official releases, and it's also used by people who have priva= te > > freebsd-update servers. Or I should say, it _was_ used. It's orphaned > > code now. Could you please migrate it to git, too? >=20 > It was moved to: https://github.com/freebsd/freebsd-update-build I'm curious why the different locations for the different projects. One thing that made following FreeBSD's transition to git was having documentation spread across separate wiki entries, github accounts, and github repos. Is there some policy those outside the project can reference to know which resources to pay attention to for the different FreeBSD-owned projects? Thanks, --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD https://git.hardenedbsd.org/hardenedbsd/pubkeys/-/raw/master/Shawn_Webb/03A= 4CBEBB82EA5A67D9F3853FF2E67A277F8E1FA.pub.asc --3cbzf3wdfurc3mvf Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAmCMLO0ACgkQ/y5nonf4 4fpepxAAnOzNyYngPea+b4L9VAW/X/gZYqlhb+M/aIC2jQTGG3BSM3OOllQvwNhN /Nvb6HB75P6/PgA+gVsyuoJ6pw8Tmko+u1PsGbn1wWNd+cgPhqchYhSukOZ8nkUZ nipWUz45QWNI9Edwe06AiwR2eTJJt/3k5XaytueSc8/yQ63nPcA2vMKdRueHYzRK S7bA9Yyc6rP3UuMDltiCCtng0OernBu5ovNNYUzlEpaY5uTs7kWqpoyy478AEIAR bPJeGgS8ITuuUBFbBiqMA06b6cc1WQkRXsHQbb5P+q9m9ZEnsgIE5dRxxjyDz3FD gLeRYOUZwWfYZiDjCvOgR5vyDpFINf4x6jg2rkxx4hUVeTfGKNmvwH0+jAnLQmjE HYeRt2mW+bbQH+kEYLxHwaCin4xc6/M4uVZgcYxpi6qn0UoJ5SYttvO15r1uXhPR VadP7M25rE1C5w4xQU81fjbt8c2bsjGTgdd9XniuoK2QgC9aH+4qTpQu6tUGp5qQ ELr2Ze/C4UYnipprmRXbtPzuezTSLCfN3rs07XSk46Ehk1V6NVcfYG6FKXWz3Kqj Y7TxNQn28H2FDtjQjzguCCoGEWDUQ63auCDID6+Zbtbz2wP3PXvS1yTUzEg9VD3i 0v6KoDO5hWxxg5s3xFS3yuFzKfvC6dH7o/P/RYBPgvGV+G0Fzdw= =bdVn -----END PGP SIGNATURE----- --3cbzf3wdfurc3mvf-- From owner-freebsd-git@freebsd.org Sat May 1 01:09:34 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 800D25F05A5 for ; Sat, 1 May 2021 01:09:34 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXB3K1VpJz3s5Q for ; Sat, 1 May 2021 01:09:32 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 461CE5C00E1 for ; Fri, 30 Apr 2021 21:09:32 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Fri, 30 Apr 2021 21:09:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zyxst.net; h= date:from:to:subject:message-id:mime-version:content-type; s= fm2; bh=b5X6R3Azs0ierNcTI3FoZ3nBqADY82cb3qD6WY3ykbo=; b=rhFgS0jx 6hZR1SC3zgLVRM+Ad5B+ECiOlIOeZdkzvMQD5hZ45e5dO2InrU1OS2aLeCTR+b8Z cB1WYYElgX3TyI/p9yWeP/vQJ5tlsqPnFJMWkp7UQdAunKFwKDzhFIdyKSAXdYPA SksVN/ii/OBaeh6Mw9ic8KJ1webde5u5USofWJGKzDClm9/8MKk7m5YOkvygUpJk e2DwKaoQfvUBbug5UODAKELtRNJbFCh42FEwtqCWrX7Vp1H77Az2spTGiaLd4+pl Og5NL4LfqQh7L4hv19eBq90x/W/VeKF2AJhJHNxcjf1Kw9fM+ClpByQJlrbYcGtT 6qnCO2N641OJ3g== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:message-id :mime-version:subject:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm2; bh=b5X6R3Azs0ierNcTI3FoZ3nBqADY8 2cb3qD6WY3ykbo=; b=coLmtqdlFf1IGPkrDicvIb1n0j0fpMYHCRe4RrXadoVvH HnJyanZ2uf2eAvOLk0xb2J1mkRKwmd5ZFr36ymqes33bjCKxOSV1W5jexdEEMUSh CEhD1owPDTVcbwugFoPPW4txQuziNQqH/8ij8V+3xpJgxgM6lwVDGqDvkKHRjI1C eoh5Ql/9ZQga/eNGO3ujJArYgZQ8GtorK7V+ZACQhjsVrBkx3ZSCFJUitqsQkWH6 ekbJSoezHUHTrLINepn0pa3wVwLQqWSFF2DAfTlSFVXfOYSgYK0PTU4kS04lVIl4 qLUMZ1iviCERa8vi8lZI+VgJgIRyytWD/wQa2P63Q== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvjedggeehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkgggtugesghdtreertd dtvdenucfhrhhomhepthgvtghhqdhlihhsthhsuceothgvtghhqdhlihhsthhsseiihiig shhtrdhnvghtqeenucggtffrrghtthgvrhhnpeevgffhffdtfeekleelhedtjeelvdfhvd egieejveffgfduvdfhteegjeeujeeuieenucfkphepkedvrdejtddrledurddutddtnecu vehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthgvtghhqd hlihhsthhsseiihiigshhtrdhnvght X-ME-Proxy: Received: from ceres.zyxst.net (ceres.zyxst.net [82.70.91.100]) by mail.messagingengine.com (Postfix) with ESMTPA for ; Fri, 30 Apr 2021 21:09:31 -0400 (EDT) Date: Sat, 1 May 2021 02:09:29 +0100 From: tech-lists To: freebsd-git@freebsd.org Subject: git cherry-pick Message-ID: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="0GlOsnPTRgGuZk28" Content-Disposition: inline X-Rspamd-Queue-Id: 4FXB3K1VpJz3s5Q X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zyxst.net header.s=fm2 header.b=rhFgS0jx; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=coLmtqdl; dmarc=none; spf=pass (mx1.freebsd.org: domain of tech-lists@zyxst.net designates 66.111.4.27 as permitted sender) smtp.mailfrom=tech-lists@zyxst.net X-Spamd-Result: default: False [-5.70 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[66.111.4.27:from]; R_DKIM_ALLOW(-0.20)[zyxst.net:s=fm2,messagingengine.com:s=fm2]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.27]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[zyxst.net]; DKIM_TRACE(0.00)[zyxst.net:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.27:from] 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, 01 May 2021 01:09:34 -0000 --0GlOsnPTRgGuZk28 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable git newbie here. If one has the full git /usr/src repo, and wants to build for stable/13, what are the commands to "cherry-pick" a commit from m= ain and apply it to (local) stable/13?=20 thanks, --=20 J. --0GlOsnPTRgGuZk28 Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAmCMqjEACgkQs8o7QhFz NAWZhhAApqPF0cC4rgpRiznm0ldRY9HF4OWrYaAStGeCDg3deyDhJ9xsxsOXUJk6 QF0AXlTH2f1bjDOcjKUMmZ85QgzkCgAcfHH/2I8DsKuG5UXeofjf3bAiVggoF4Ct oATLun08UH0aIseQB8a3WkFaaOqM92GaM03HFeI+5YUvnRBbXOHqNI84gRT+XU9j braqfGIBwL5KUKQwPjKd505mJ9Ijegh8XS1S8m/97ddMxnOA74kbpzNmiLQdwxYE j/NM6owCyYI9y/RPG6IoHMwzhI7CixTATIwVr6Jlq3BOfYxJ5JPmciUYHf1bFsRG Kfd3TmZe1I+1JRqIVtfKfUP82LRNJ4rvInTDgsx8Uu/rXyA4s6IQ2C0QpIxb+dR/ sgB0Nqbl3FL6BBkehWfxvIzH15rTvwzhnvGkESsKOJuvOo6NRwWtdQRwcbxx4Yq+ Lm0ioRzmVuh1OOJIym+qXTANyvenWNURPIIMdFjcpYosmSjYTDOiO45EdAPOdtbs MJp8OCcwiqF+VGah/0Ct1wKwrjTEBldD+fkdluxD96cCgzTRsuoplhaqSSXk0KOT hc6sZ+NaxjYzndBhZrZRFFgvgjGfi8LYSx10HiDJxYnP4vFj97btF4FyZSJyENGN GLZVkkEhAF3O17/9bGkQ32zV1gR1kgEq3B/tT7Bkv3K90ULsGBY= =w75I -----END PGP SIGNATURE----- --0GlOsnPTRgGuZk28-- From owner-freebsd-git@freebsd.org Sat May 1 01:35:36 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 85C5A5F29D3 for ; Sat, 1 May 2021 01:35:36 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from mx.catwhisker.org (mx.catwhisker.org [107.204.234.170]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXBdM28VSz3tZ4 for ; Sat, 1 May 2021 01:35:35 +0000 (UTC) (envelope-from david@catwhisker.org) Received: from albert.catwhisker.org (localhost [127.0.0.1]) by albert.catwhisker.org (8.16.1/8.15.2) with ESMTP id 1411ZXos085418; Sat, 1 May 2021 01:35:33 GMT (envelope-from david@albert.catwhisker.org) Received: (from david@localhost) by albert.catwhisker.org (8.16.1/8.16.1/Submit) id 1411ZXna085417; Fri, 30 Apr 2021 18:35:33 -0700 (PDT) (envelope-from david) Date: Fri, 30 Apr 2021 18:35:33 -0700 From: David Wolfskill To: tech-lists Cc: freebsd-git@freebsd.org Subject: Re: git cherry-pick Message-ID: Reply-To: freebsd-git@freebsd.org References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="xODsafbnC9KOsOiJ" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FXBdM28VSz3tZ4 X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of david@catwhisker.org designates 107.204.234.170 as permitted sender) smtp.mailfrom=david@catwhisker.org X-Spamd-Result: default: False [-5.39 / 15.00]; ARC_NA(0.00)[]; HAS_REPLYTO(0.00)[freebsd-git@freebsd.org]; FREEFALL_USER(0.00)[david]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:107.204.234.170:c]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; REPLYTO_DOM_NEQ_FROM_DOM(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[107.204.234.170:from]; DMARC_NA(0.00)[catwhisker.org]; SPAMHAUS_ZRD(0.00)[107.204.234.170:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.993]; RCPT_COUNT_TWO(0.00)[2]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; RCVD_TLS_LAST(0.00)[]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:7018, ipnet:107.192.0.0/12, country:US]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] 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, 01 May 2021 01:35:36 -0000 --xODsafbnC9KOsOiJ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sat, May 01, 2021 at 02:09:29AM +0100, tech-lists wrote: > git newbie here. If one has the full git /usr/src repo, and wants to > build for stable/13, what are the commands to "cherry-pick" a commit from= main > and apply it to (local) stable/13?=20 >=20 > thanks, > --=20 > J. I strongly suspect that the most correct succinct answer will be "it depends." Unfortunately, that's not especially useful. So: here is *a* way that worked in this specific set of circumstances: | g1-55(12.2-S)[9] cd /bkp/tmp/ | g1-55(12.2-S)[10] ls -F | ... | g1-55(12.2-S)[11] mkdir src So: I switched over to a place where I had some scratch space (as I have no plans to keep this repository). | g1-55(12.2-S)[12] git clone file:///repo/git/freebsd/src.git src | Cloning into 'src'... I keep a local private mirror of the FreeBSD.org git repo. I could have used "https://git.freebsd.org/src.git", but it would have taken longer, and might have interfered with Spouse's streaming video. | remote: Enumerating objects: 429434, done. | remote: Counting objects: 100% (429434/429434), done. | remote: Compressing objects: 100% (45509/45509), done. | Receiving objects: 100% (3874077/3874077), 1.19 GiB | 32.66 MiB/s, done. | remote: Total 3874077 (delta 411617), reused 386363 (delta 383799), pack-= reused 3444643 | Resolving deltas: 100% (3066950/3066950), done. | Updating files: 100% (86557/86557), done. | g1-55(12.2-S)[13] cd src | g1-55(12.2-S)[14] git branch | cat | * main So this repo is currently using branch "main". I'll find a commit to cherry-pick. | g1-55(12.2-S)[15] git log -n 1 | cat | commit 388c0cde10293d9a3434e99146bf391aec6878a3 | Author: Kristof Provost | Date: Tue Apr 27 18:46:03 2021 +0200 |=20 | pf tests: Test scrub fragment reassemble on interfaces with different= MTU | =20 | There's a problem with pf's reassembly code where it produces incorre= ct | checksums when reassembling across interfaces with different MTUs. | Test this. | =20 | PR: 255432 | Reviewed by: donner | MFC after: 1 week | Sponsored by: Rubicon Communications, LLC ("Netgate") | Differential Revision: https://reviews.freebsd.org/D30013 OK; that seems like a reasonable candidate.... | g1-55(12.2-S)[16] git checkout stable/13 | Branch 'stable/13' set up to track remote branch 'stable/13' from 'origin= '. | Switched to a new branch 'stable/13' I switched to stable/13. | g1-55(12.2-S)[17] git cherry-pick 388c0cde10293d9a3434e99146bf391aec6878a3 | [stable/13 419302f5369] pf tests: Test scrub fragment reassemble on inter= faces with different MTU | Author: Kristof Provost | Date: Tue Apr 27 18:46:03 2021 +0200 | 1 file changed, 49 insertions(+) | g1-55(12.2-S)[18]=20 And that was the cherry-pick. Mind, there exist ... nuances, I suppose. If the commit to be cherry-picked is a merge commit, you will need to provide some addiitonal information (as detailed in the output of "git help cherry-pick"). Caveat: While I do use some of this at work, I am by no means an "expert." I suspect that there may well be "sharp edges" in some of this stuff. I suggest that if you have the resources to do so, you experiment with an expendable copy of your repo first. Oh: after all that: | g1-55(12.2-S)[18] git status=20 | On branch stable/13 | Your branch is ahead of 'origin/stable/13' by 1 commit. | (use "git push" to publish your local commits) |=20 | nothing to commit, working tree clean | g1-55(12.2-S)[19]=20 Peace, david --=20 David H. Wolfskill david@catwhisker.org "some of the terminology that was used, like 'hugs and kisses,' and 'very fine people,' is like very different from what I experienced and what my co-workers experienced on the 6th." - Michael Fanone, DC Metro Police Offic= er See https://www.catwhisker.org/~david/publickey.gpg for my public key. --xODsafbnC9KOsOiJ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQGTBAEBCgB9FiEE4owz2QxMJyaxAefyQLJg+bY2PckFAmCMsGVfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUy OEMzM0Q5MEM0QzI3MjZCMTAxRTdGMjQwQjI2MEY5QjYzNjNEQzkACgkQQLJg+bY2 PcnEBQf/dEs7yt+gdrmgePlfQQig5xPYOsgcYzLeXUaVyK3yMa+pou8oOnRjrCev 6C3ZZp7kbbua/B4bSLHw29aOjiezqcxio+Qt+t+Rdh6gT2SV7OTCXLgpTMCBWji7 VxUDprXEGY5rb6rCb/bRaizbF2Qm17SW9yC1ypAv6zjj3YCVpQaXiQTxrBs4pS7Z EsO27ZebuWeH/JydxXNNLu2cnPoz9dFGhkQMZ5x21adSj0ZbXenPxSJH9kW7aWid mdxlngTTgiht5BupYd1RlhZ8tIaDC6S4uydoSNis8Lj+5SP8VBBeNDfMYGrwbRk3 /05Q4OwRjNpSI7uMCCuG1QwNvh1wCg== =QBIc -----END PGP SIGNATURE----- --xODsafbnC9KOsOiJ-- From owner-freebsd-git@freebsd.org Sat May 1 01:37:45 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 AEF945F2BDD for ; Sat, 1 May 2021 01:37:45 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic316-55.consmr.mail.gq1.yahoo.com (sonic316-55.consmr.mail.gq1.yahoo.com [98.137.69.31]) (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 4FXBgr3Vzcz3tZK for ; Sat, 1 May 2021 01:37:43 +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=1619833062; bh=dECumo0Ge9tQqgXCvPq8osEVxCOxMS2kAAfXnuwEP0I=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=QwpQg27su/H848TDft0iRWNEV6zWj7RY5Ox4Jo77mtvpeA8+oVjpSxbGpWv22g33cHMCLoZfp4ZZTBdHdohfthp3sAWFRKoSYzUTHjd40cQmqn0gljxSc3Y0nX6a4jd2PM6b6ftItvqnwTOkHSnQSbyswBNJwIIHv6Xx3TUtCJ+9/cvCjCa/Z/colTzQL9fZsqzTzR/n2hF9Jm5bKnNzdTwAddIsjDgpjAYK9/wBoXY6IiwsYDcPtbSktABu7+l2AQxLYkcCD8EB0Vi+/DQ7TFkb+qf9FWEMdkxGFPrJ4haz0pO+qu0CDvq8tRgaznpwhxSvMxA3LGwzKfbEaTp0kQ== X-YMail-OSG: Wjl_qP8VM1nuIuPot4AwHrw6bN5r.a.KO5N46wYUrj.Y7.ci7jjPaolwD.XRNYD 1Ntv61fllB1kZLZOw8JAcmZnB.hGeMR4jG3o5QBuek46XdYHxAwCu3ZZct5Z2JkV902W95KXq1Ul w2YCvSqEN6iUMPajDpIlXGREk8aomlhWE147qCtrpT.0yyjGOvMBGRP1.qCvTumH9rotpNVLa6xZ xCMqOd_ZfYfjKzU7Gl7wsFhxyp98pom2hrfkS0Emckg4sMySKa26Rpwy4nZhcuNqPReN2xihWU3h 7KjTSMR4JAOGUE2W2fJTp47OXS2SfWp0xLDRKoIBNJtGuyzl2XvyHZ3ViZkWOvATGT1FeAIVUI8e l7yqSJiLtivCQ._7EaByYfd2eKIQyKlWywP5va3jFyBbQn584cv5loDKhlq97cL5A4eJKvU8xfJ1 GTItdaDYgjiTpJSSIEc06vSvbsCbiEZQjKQUnBkmv6QCRfshvoGcoCeR57yHJMZKdhEkHs74.G8I hUCcWzt0DIoxFvsFW4fwA7nJV_NOCtsCMDZIEuDB0lhvvkGPcMM6MgyZHYT2wr8eiZxVeMJjqC3J .Wu5_VC.nuFJjEGA_TuK5oPgvL3S67s73_WwiToOXvn4IPAhOA8QB..YrQnCWirF6OVWFzG79G7r pO380aAaD1cBD1M2868IOx8oeCQ6VJQmlswBKDNkviLpbGwVltIEBiGWgjvZr8QegC1mOD5Rr959 dmIHRxWH.0YkAwdcm44jl07PIgqnvI2ml1wipinHaVxhr.t05GU_Xe1E9bVurTdGdKPHkTfOJ0f6 fUGHo5XM_nFTaRVakaoHlng3nUKXq2mrlbyizaWhT4dXZzVbcG8FXj4Wavj5O20YxjANOWp44GhD 7Ic5.mt5KsGXsZz3eYUZo82Ww90GrSR831mWHqKtjC24V60e9qw9Jd0a6Fy7NzIAfVzhXc9rlx51 AiW3GfxreID0rBmWIGLJyluw8ZBzHXepDkgG5AyOYzu55No4VbIft.4YscrVzlyRNdOJgfTrqRn4 .xilrYbnUMkkDiF8qlt6Vlr5EcbezphEajwegLIhygh.3zIx.Ik6Fs3sMDVKl5VtUajASvWwNReN pC0HqugFDoDyQrxImF8ZFHR.mAqE_VtkhfBNEd0tTDUgNT2STbTARIltj.GcmgSIYor5HaV_oAcB FTINSw7wXf1dFZGdKe4hbLbgv4L_pDmv7I8tgXisT8ShhsRJYJu9DolqZhpD.8VWmdP9QQE3N_6o HnQlHeep47Jf__F3fcC4pbOptKvV0OmfGgPx6P1AmZ13BRLuKxgo6xZvS7ZuE3UpqQ2sKzm0VVAi QhIk84rSqtfBj10.bDb8lWEbnDt3KrKrMqJAHT7lOGGZgKTzcERkmFjAi3LviimHHQ60Iky_Ih8n lMcUG_QTJYmrihnyvC6jeZGYmwCxIq2VJ6vul7Q3PTjg5qzlaiHc2bOHRXO7AxxQisUbr_lkIAGs pw2YxWEkiK8P5ynJBKIJ9163aG46i6fgxqNfRJyvR.nf17ON9dwviAyWTaMNeujWlqvNqSdQ9ife ZDDTq.iibCmmT0SVROYer3VZUsztdlzRBl2RzLrLk0XLMUN3ffNiO2kIPQCt1aMR2hUszKErCnt1 qyTTaU5RyxxOvbyJcDB7ALJOdnCa3lDk_VSJUI_mkaVaProjmCZMDSAZOVIIgK3ZTly9fmGv56NW wWs3zZDLqOMPGi8nIXzM1jEr34mkSndSrLlwaApXdzBpHK_DBMU.kHUUeoLBb3K.3eOVIcqJEG2a b18.gdMOrxtL77g18df1y_BBLZg4FpupsitATuB6XXLBnQho5mUgitKyBOHHFlKMmsuLxebaEI7C ZSlTs9yFnz108IspNsNS9LbcCdGEoBsR7LO7FehdF9Mwp7GsUOXH8Uiu7NP9SESHdK8HupXZ4wQX 2sGcP6zA8b5w2h4VI9ci0yL_jPGDwN.fbSdkrvzN9PQvCksE3xHA0j3xnhXkaXG070TNmXEghiZZ ysuswssdUmgPnQrN.a2p7ThbyJr5XqUc34qBj.CepF05K3Jd_Fblb.sNjaxpKdaIOWk85HmjWaGl t5k0rVwRbrg0QjIsYDNaZYY7itf2gaVzkCt8NxtNypjkiHpttQQUL5CO7Fnc_uciNUarzK0lPqep .kMltx9BJ79yT.IHlqoA7Yj6Ay71YS6TAW0yx24VqsF0OTe2sRcHtafoPUdsFta_A4LUGZEPf6km vk4umy6lTd8M9qaxWVuZW6yyl1KVF.QtLDGRHyE5OjATmgOXgl0Iw0uh5F.5geOBUms.5B5s3ZIi nShR7iP5hTyXTBeBaVHQO46Sek0w3xuHczAPgbbKbqfZnGRfFlPvpy9A5WwMdkanbarCqzJY66KQ 7.4I_rm8dVr9C8JzNMF8PTDNrHS3lcJH9uPQPcdrEz42KG.M5_WMW3M5L1JbmaNtsKUNIwegCLL9 LE9FvOq.uiwYnF92Hs.uokvhdwd979F635NmSFz8bAFfhDlPG6Ize93QsSzUGD3KCy7OtRNEm X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic316.consmr.mail.gq1.yahoo.com with HTTP; Sat, 1 May 2021 01:37:42 +0000 Received: by kubenode549.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 0608947ba495a4a50866de837f3b38d4; Sat, 01 May 2021 01:37:40 +0000 (UTC) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.60.0.2.21\)) Subject: Re: git cherry-pick From: Mark Millard In-Reply-To: Date: Fri, 30 Apr 2021 18:37:38 -0700 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: References: To: tech-lists X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FXBgr3Vzcz3tZK X-Spamd-Bar: --- X-Spamd-Result: default: False [-3.50 / 15.00]; TO_DN_SOME(0.00)[]; FREEMAIL_FROM(0.00)[yahoo.com]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ptr:yahoo.com]; DKIM_TRACE(0.00)[yahoo.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[yahoo.com,reject]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_LAST(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[yahoo.com]; ASN(0.00)[asn:36647, ipnet:98.137.64.0/20, country:US]; RBL_DBL_DONT_QUERY_IPS(0.00)[98.137.69.31:from]; DWL_DNSWL_NONE(0.00)[yahoo.com:dkim]; MID_RHS_MATCH_FROM(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[yahoo.com:s=s2048]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[98.137.69.31:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[98.137.69.31:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[98.137.69.31:from]; RCVD_COUNT_TWO(0.00)[2]; MAILMAN_DEST(0.00)[freebsd-git] 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, 01 May 2021 01:37:45 -0000 On 2021-Apr-30, at 18:09, tech-lists wrote: > git newbie here. If one has the full git /usr/src repo, and wants to > build for stable/13, what are the commands to "cherry-pick" a commit = from main > and apply it to (local) stable/13?=20 You may have to provide more description of the end result's properties that you are after. For example, Are you intending to have an automatic new commit for each commit you cherry-pick? vs. (no automatic new commits but . . .) Are you intending to have the index already have the updates to the working directory added? vs. (no commits, no index additions) Are you only after the working directory containing the source changes, no implicit adds of the changes to the index? "git cherry-pick" can do the first 2 from what I see reading the man page. --no-commit (a.k.a. -n) leads to the 2nd alternative above. =46rom what I read, the 3rd alternative is not something that "git cherry-pick" can be told to do. (git's terminology has a fairly specific span of meanings and avoiding meaning something outside that span can help avoid confusions. But it takes a fair amount of reading to identify the span involved. I learned while reading for formulate this note.) If you are intending commits, it seems unlikely that you would directly use a stable/13 branch and its HEAD and then commit to it. More likely you would create a new branch from stable/13's HEAD and then work with that new branch, including for committing. Otherwise future stable/13 pull operation are problematical. I'm not sure that I'll be of much help, even with the desired properties specified. But others may be with the extra information. =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Sat May 1 01:57:41 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 3670F5F4629 for ; Sat, 1 May 2021 01:57:41 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x72b.google.com (mail-qk1-x72b.google.com [IPv6:2607:f8b0:4864:20::72b]) (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 4FXC6r19Wcz3wBG for ; Sat, 1 May 2021 01:57:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x72b.google.com with SMTP id 8so138153qkv.8 for ; Fri, 30 Apr 2021 18:57:39 -0700 (PDT) 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=Nd65wrFO+gRblWBCJpSoMzwUovRZEsYMt0qHSo+j55c=; b=0NWGl12efdFuDe4E9F0Hhg0t7OfcTgR8SM9/w3EpInvrjnN5TIi/cnnyLYu/0GCqXG vQGBaLxNtIpHjl2CxMWNHiFA3APbE1XXwsduaES4SfskakWNFl2nfPqWShG0c4Odh6O1 3BG/rWePiDtl81asoG9al0FlY6aqcqUgAhhqYoKUJB8FzYOgK9c6MdSO3nMOTkRIEL3V MxSv+XgcIHnjIedyOrM3gPPTDdmt2Y19KvU4Z8IB1pJnA7ZFW4xI0OXp7kHkm54lOg/q RaanQo1KMZThIKJiNfwvVSaoOy/U5SAiyXMi/SCzg1U3w+BBInl4YxwmGwyU4yAPedyG M5eQ== 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=Nd65wrFO+gRblWBCJpSoMzwUovRZEsYMt0qHSo+j55c=; b=dOCXuX29fouJsqhhuMSXfcURgeeJtDMhNEuU0ADLsMNVwt7YkCWzOF5nw1609lCB73 QqjPr1neYatQV+km4AbpoujcaSkavglQIz4pUfvw5po2/kEP5G6qxnXmEljowLUs15vY MrpTuKIT6KHG++JXhZs5KdHxMB8kaEU2djDBRBB/f9eMpU9bZLLO0zmv1aG5Zn0cqyh4 CbuWVPCjWTZizucLImesJnYZVlMXcYEKaxmrEAJseY7YXHckje47SEqwkhEWyza997ZE o+mDVT5HKz6mlRb0X4boFvDxuvEWaX+n0VGwEIZBBSw2rQWGhBZ1Do7A2IPR8c1iXk0q nsnA== X-Gm-Message-State: AOAM5321PL5QaV6s8NJOicH4LOrJ8BNWp0r8ivkkjpQZzgwa9010uQUb Q/WohyunmmPIdovZh9jf3eeQxVhP+LhjYq8RsNiR2dUufKvmBA== X-Google-Smtp-Source: ABdhPJybBsPcY1kxsqkMqSHRF1LJxBL0nou4p0eYCQh9idSxExGmO03YpX+K6fWsTaN7GI4fIfBXymC7F+hZMQBCSmI= X-Received: by 2002:a37:7685:: with SMTP id r127mr8275182qkc.359.1619834259124; Fri, 30 Apr 2021 18:57:39 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 30 Apr 2021 19:57:28 -0600 Message-ID: Subject: Re: git cherry-pick To: tech-lists Cc: freebsd-git X-Rspamd-Queue-Id: 4FXC6r19Wcz3wBG X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=0NWGl12e; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::72b) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; ARC_NA(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[bsdimp.com]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::72b:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; TO_DN_ALL(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::72b:from]; NEURAL_HAM_SHORT(-1.00)[-1.000]; R_SPF_NA(0.00)[no SPF record]; FORGED_SENDER(0.30)[imp@bsdimp.com,wlosh@bsdimp.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::72b:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 01 May 2021 01:57:41 -0000 On Fri, Apr 30, 2021 at 7:09 PM tech-lists wrote: > git newbie here. If one has the full git /usr/src repo, and wants to > build for stable/13, what are the commands to "cherry-pick" a commit from > main > and apply it to (local) stable/13? If one is tracking stable/13, one usually is allowing others to figure out what to cherry pick. Generally, it's most commits that don't change the ABI and/or that fix bugs and introduce low risk features. As a tracker of stable/13, one needn't worry too much about the mechanics. Warner From owner-freebsd-git@freebsd.org Sat May 1 10:24:03 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 C14425FB115 for ; Sat, 1 May 2021 10:24:03 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXQM66yzkz3vjZ for ; Sat, 1 May 2021 10:24:02 +0000 (UTC) (envelope-from tech-lists@zyxst.net) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 06DD420A5 for ; Sat, 1 May 2021 06:24:00 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 01 May 2021 06:24:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zyxst.net; h= date:from:to:subject:message-id:references:mime-version :content-type:in-reply-to; s=fm2; bh=8da/XLjUx/vjCRLHlTh/0rses0q XjcLm3KD0wqaLpUI=; b=ChgorbK9dp64/unWtUO9MhCQAefGAuSxUocfJ89b7bF W4fcg+1Et4oI92Wm8Ywqv3HX6/Yn0CXHrMor1RTMobbvW3mpszg6JXORmUUECldV gmsrA9N+TvUh6fwmmAACqqwDsGYKeJfEfsNiFq2IfkC5ClAf59Kz0zARtJe89lb9 VcXVIKloXAmLEez9PUBlrVWJ5DSxTLi0FqNP5Fatipyy7oo6/KrrVki+wcKKGW5R pNqjkeZkBDZUlxVyCXca1wrIWD+5Es3/+h9mHMGvK7OYrobGwjoMDhhQbwhNKvqy hNZ5qMbLqyffnmIWnYC/vI/ONxktTIzwQUzP1DO8xcQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to:x-me-proxy :x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=8da/XL jUx/vjCRLHlTh/0rses0qXjcLm3KD0wqaLpUI=; b=gDUq1gpE+AZUgknTUDLONg XJfVHNJYdpBRSRgze0np/DGZAF8gmDatUBN2sdM/mFUZDzlk4UUkg/7FSzzTS/vC B8M5Q3ZPXOt/FFdZ5Zi8iMPzOWpESZ9Tpnfwkm1ytBG+yQsclUmhrmLCSw+5BYcw ZBmhA+sKVDdyYq/Cs74DYCcEutZMSLibMo2UYKf9+9cL+1RIxj3JoziNG9MA7ItI oi4CG+RrdDR6i/I4MGLOvP1TaFfxvtCVBVQ5+Jjtq743OU0DEupf91880v5Y4BHR RCfAlHOcNv2W482GCTHwQEUHYnr+s/DyGA7EKAs0u7j6qZHZ/Ll9+QPdYVpqNQAg == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgeduledrvddvkedgtdegucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpeffhffvuffkfhggtggujgesghdtre ertddtvdenucfhrhhomhepthgvtghhqdhlihhsthhsuceothgvtghhqdhlihhsthhsseii hiigshhtrdhnvghtqeenucggtffrrghtthgvrhhnpedtheeigfdvudefkeekvddtfedvte dttdekuddvgeevlefftdekffdujedvhfduteenucfkphepkedvrdejtddrledurddutddt necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepthgvtg hhqdhlihhsthhsseiihiigshhtrdhnvght X-ME-Proxy: Received: from ceres.zyxst.net (ceres.zyxst.net [82.70.91.100]) by mail.messagingengine.com (Postfix) with ESMTPA for ; Sat, 1 May 2021 06:24:00 -0400 (EDT) Date: Sat, 1 May 2021 11:23:58 +0100 From: tech-lists To: freebsd-git@freebsd.org Subject: Re: git cherry-pick Message-ID: References: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="E8b5HWTc/PsZHFRL" Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FXQM66yzkz3vjZ X-Spamd-Bar: ----- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=zyxst.net header.s=fm2 header.b=ChgorbK9; dkim=pass header.d=messagingengine.com header.s=fm2 header.b=gDUq1gpE; dmarc=none; spf=pass (mx1.freebsd.org: domain of tech-lists@zyxst.net designates 64.147.123.21 as permitted sender) smtp.mailfrom=tech-lists@zyxst.net X-Spamd-Result: default: False [-5.28 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[64.147.123.21:from]; R_DKIM_ALLOW(-0.20)[zyxst.net:s=fm2,messagingengine.com:s=fm2]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:64.147.123.21]; MIME_GOOD(-0.20)[multipart/signed,text/plain]; TO_DN_NONE(0.00)[]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCVD_COUNT_THREE(0.00)[4]; DMARC_NA(0.00)[zyxst.net]; DKIM_TRACE(0.00)[zyxst.net:+,messagingengine.com:+]; NEURAL_HAM_SHORT(-0.58)[-0.583]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; SIGNED_PGP(-2.00)[]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:11403, ipnet:64.147.123.0/24, country:US]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_IN_DNSWL_LOW(-0.10)[64.147.123.21:from] 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, 01 May 2021 10:24:03 -0000 --E8b5HWTc/PsZHFRL Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Thanks for all the pointers :D --=20 J. --E8b5HWTc/PsZHFRL Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEE8n3tWhxW11Ccvv9/s8o7QhFzNAUFAmCNLDYACgkQs8o7QhFz NAU1xQ/9F9UqgpSv8At3xRJjP0QxZRJLIX5YP0sdWG88JCQKfyp6GpW/T0+Pq5g8 DkJ64Jr7H6NNbG6x5Bl+yVw4z1KayiSyk7LsUw0fO9vgcwDOgg8wiDZebjMj4D92 sYRvHOwsQ1fDeJY6NiQirr/pvUJ9uki1Al6TPrLpBbmukTja5mOfS+lN0ZaEQX7E eVBiY58LxIilthlM5osl98AP8T41Xwupuwl9DMhNPTjKJEENKtx2g73mwIpDvxr1 7pCd+Mn8SnMcQrUgskxFrq777JyMvr6z98YVmdYI8ImsS43C5m13oLN933Lk6QZD J42GBZi8oCp78Rz7nzFjAosPAvLjQYCJS9jVTVsOeKm1TvzIo0EMMATyNtXHre3o wrT6K9Qj64ZPGg+3UQYnymt30kTN4iV2n+zM+7Opq7HfK/rwpA770BOwtu+3i3KV oNGacwIUOcXl9q9yUtmnVoRUGnvfoUKWVqpl5UuELKc6LkGxdqaS9g7LIG4CoEh8 KHGGhW3uDMQCfnHNHbLARJvsNsa7WXDgG5Yi/qrPcOYg3CArRdlTKqUxUo1exMM/ OOsQR/lVZymg7ouSy3FADAHiJkHIxF5IxpafBjqt7lfQqIO65JWCpnkjRN5hQWua +eVGtOgPliPQbRLALbp9BwaxJ9dFhPj0OWwp7UI6HBkuiJVY+zM= =29HE -----END PGP SIGNATURE----- --E8b5HWTc/PsZHFRL-- From owner-freebsd-git@freebsd.org Sat May 1 17:07:11 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 8ECB963247E for ; Sat, 1 May 2021 17:07:11 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXbJH3jmXz4jpf for ; Sat, 1 May 2021 17:07:11 +0000 (UTC) (envelope-from mfechner@freebsd.org) Received: from [IPv6:2a02:6d40:36e8:a301:e8d0:b579:a5b8:7d31] (unknown [IPv6:2a02:6d40:36e8:a301:e8d0:b579:a5b8:7d31]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: mfechner) by smtp.freebsd.org (Postfix) with ESMTPSA id 2DE481B77 for ; Sat, 1 May 2021 17:07:11 +0000 (UTC) (envelope-from mfechner@freebsd.org) From: Matthias Fechner Subject: Script rmport shows error message To: freebsd-git@freebsd.org Message-ID: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> Date: Sat, 1 May 2021 19:07:08 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.10.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Content-Language: en-US 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, 01 May 2021 17:07:11 -0000 Dear all, I thought that the rmport script was already updated, but I cannot use it. I tried to execute it with: Tools/scripts/rmport databases/rubygem-gitlab-pg_query fatal: ambiguous argument 'remotes/origin/main': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' you have local commits, exiting But there are no local changes: ╰─ git status On branch main Your branch is up to date with 'freebsd/main'. nothing to commit, working tree clean The FreeBSD repository is under freebsd and not origin, maybe this is the source of the problem: ╰─ git remote -v freebsd https://git.freebsd.org/ports.git (fetch) freebsd git@gitrepo.freebsd.org:ports.git (push) origin  git@gitlab.fechner.net:mfechner/Gitlab.git (fetch) origin  git@gitlab.fechner.net:mfechner/Gitlab.git (push) Has anyone an idea how to fix/use this very useful script? GruĂź Matthias GruĂź Matthias -- "Programming today is a race between software engineers striving to build bigger and better idiot-proof programs, and the universe trying to produce bigger and better idiots. So far, the universe is winning." -- Rich Cook From owner-freebsd-git@freebsd.org Sat May 1 17:17:38 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 66B966328AD for ; Sat, 1 May 2021 17:17:38 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXbXL2QQ8z4jqv; Sat, 1 May 2021 17:17:38 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619889458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Jv2KW/+UgfQDdeSu87Fh430HdKOvfR6p4H/LH1c5Uo=; b=KHxjuT9sTVdLPbaOMgIq7Gn5oqaIA73h6ZYItX770PfeYMVtM6DdAETFkKAnSNpmFvesfW AxEf4NiHt8qrpARCx/3JQQ0qx0/2gSLyXFNjT3I059DnZXg6yfwCX4nko+GvxZDuuQphel mNI03FhG5NXwMgAuxx9hyW5x+QQnQ+ohh7yxTlFRQZfss0B/bd+Kfhc1ymZ4KCZUK9T+ff LQaQVH/8YjFyQIkfj03eQpjJDKGcaNmauktND5yd5x0W3yGtxN8uBBtsEhMGMc6KYeEch+ ns3ijF9qFQnVilCCOSvmD+Qc/RXc7/Z4V9pRdvQPkHyA/HNOpPhgtU0nJYCACw== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 33335A0ED; Sat, 1 May 2021 17:17:38 +0000 (UTC) Date: Sat, 1 May 2021 17:17:38 +0000 From: Rene Ladan To: Matthias Fechner Cc: freebsd-git@freebsd.org Subject: Re: Script rmport shows error message Message-ID: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1619889458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Jv2KW/+UgfQDdeSu87Fh430HdKOvfR6p4H/LH1c5Uo=; b=kxkJjeGnAWwpwz6j9lm4TwQ+i+TQxiEE2klLrA1dX6aGUVakUGlwFds8C1CWcP/WcIchjF I8K4pXsXRK8LxJefVoUBUMGen6fMTPqL5ATskLDjzYJXFkgX4fMUafhWqQZdhgA48d0msI yzCXbdpmtNoL2KPW2F5ysrv8/yQhZiDqvFGj0HyCo12NxhTTDgTJAIChZc7L+tUqMHNqvm oPDLEP1Set4nvqfO6GrPFNPVFKN/R9w4gXnCtUS65r3xVI/lxri0CmI8rLYjmNUjF2+Pud kabGMgpjP/9cJyaHHQXMGhP6iI7lMSusCCELAcWIX2wVqiUDzVYPKTURY7Q/fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1619889458; a=rsa-sha256; cv=none; b=USklu2mzUht183Z6iagwEehkdCJqr34JRrOQnkW021/3BUKA1mLF942/HT2vOTITzSqCIu aMHG609kh0KKCd9MEuaGQ/NQ3NS9JE83vP4V7FlBGO0mddjRjWcn1J6bSfsFU0afT4azlq vfN+IogHtgbGNxa9CcGP8FT1ZMf6TbixGfCKqRGaXCLbjIlz5dDc+MtGnkkVpDfIqJP/3N xR3GpPK+3LO+FpdEJYeRckpXBQEhEqzrFs4IRcQaxY2B7tZziovSFno9Y5vbt6kGqP5VX0 Og/7DPPmXOmBL6/sRQB8asbLkfNBopV3CLTC90rulMnPloMoUdVlokmbwl7Jmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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, 01 May 2021 17:17:38 -0000 On Sat, May 01, 2021 at 07:07:08PM +0200, Matthias Fechner wrote: > Dear all, > > I thought that the rmport script was already updated, but I cannot use it. > I tried to execute it with: > Tools/scripts/rmport databases/rubygem-gitlab-pg_query > fatal: ambiguous argument 'remotes/origin/main': unknown revision or > path not in the working tree. > Use '--' to separate paths from revisions, like this: > 'git [...] -- [...]' > you have local commits, exiting > > But there are no local changes: > ╰─ git status > On branch main > Your branch is up to date with 'freebsd/main'. > > nothing to commit, working tree clean > > The FreeBSD repository is under freebsd and not origin, maybe this is > the source of the problem: > ╰─ git remote -v > freebsd https://git.freebsd.org/ports.git (fetch) > freebsd git@gitrepo.freebsd.org:ports.git (push) > origin  git@gitlab.fechner.net:mfechner/Gitlab.git (fetch) > origin  git@gitlab.fechner.net:mfechner/Gitlab.git (push) > > Has anyone an idea how to fix/use this very useful script? > It might indeed be because you have a remote it does not expect: if ! ${GIT} diff --exit-code remotes/origin/main ; then ... fi Here I have: % git remote -v origin https://git.freebsd.org/ports.git (fetch) origin git@gitrepo.FreeBSD.org:ports.git (push) RenĂ© From owner-freebsd-git@freebsd.org Sat May 1 19:27:24 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 779F5635536 for ; Sat, 1 May 2021 19:27:24 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXfQ431Kdz4qBD for ; Sat, 1 May 2021 19:27:24 +0000 (UTC) (envelope-from pi@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 651D46355C1; Sat, 1 May 2021 19:27:24 +0000 (UTC) Delivered-To: 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 64E57635535 for ; Sat, 1 May 2021 19:27:24 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXfQ367pxz4q84; Sat, 1 May 2021 19:27:23 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lcvGk-0009rb-G7; Sat, 01 May 2021 21:27:14 +0200 Date: Sat, 1 May 2021 21:27:14 +0200 From: Kurt Jaeger To: Li-Wen Hsu Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FXfQ367pxz4q84 X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; local_wl_from(0.00)[freebsd.org]; ASN(0.00)[asn:12502, ipnet:2001:14f8::/32, country:DE] 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, 01 May 2021 19:27:24 -0000 Hi! Thanks for posting more details. With some additional posts in other places, I was finally able to understand most of the workflow. I even use the testing area to test commits 8-} > - This is still a young service, please don't treat it too > aggressively. The testing area is at: > > https://cgit-dev.freebsd.org/ports/ But right now I'm stuck with the following problem: I testbuild by having a default ports tree: $ poudriere ports -l PORTSTREE METHOD TIMESTAMP PATH default git+https 2021-05-01 21:04:04 /pou/ports/default Right now, for reasons that are unclear to me, I still have some local commit hanging around in that tree that I can't get removed. I've used a lot of combinations of git rebase git revert git reset etc, short of removing and re-cloning that tree, because I'm behind a slow DSL connection and it will take approx. 30minutes to refetch that ports tree. Can someone please help me understand how to just get rid of some commit not yet pushed ? -- pi@FreeBSD.org +49 171 3101372 Now what ? From owner-freebsd-git@freebsd.org Sat May 1 19:36:53 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 C974D635C80 for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXfd13Y38z4qQd for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mailman.nyi.freebsd.org (Postfix) id 7952763567F; Sat, 1 May 2021 19:36:53 +0000 (UTC) Delivered-To: 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 79163635C05 for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qt1-x82d.google.com (mail-qt1-x82d.google.com [IPv6:2607:f8b0:4864:20::82d]) (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 4FXfd12rxDz4qcg for ; Sat, 1 May 2021 19:36:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qt1-x82d.google.com with SMTP id f12so1017638qtf.2 for ; Sat, 01 May 2021 12:36:53 -0700 (PDT) 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=tG2m9Eb/QpED6xZH5RNRbXGjt7iUmwaJQZ3O+bJSjik=; b=aHLECwLsuvbTId3se66a+CsBlew+B7tP6EI+AUMPnYbjrswZyxtYsIB6qRd9qq6Dm/ oCg8rTEfor0x8HmA9GMHYBPRL44Fks8RL4uVzIQyCj121/Iz7na3pOZt0s9RYygA/heH HyghTmrKI/2PsB0Bv/fNO4vwYOuoBgFhFWc0KoQiAjZk6R1BqAVFMagQFlJ/qLBpSlqq 5DpTWTxR99Xg6DafN7n6mWg+jv2ckyTpEjozHbK4o3Z1vnuMTx6IIv+6w3N58uysxLEV wZ+w/1VVDF+Sc29zAqiSrnFnBTfudYz4y5yyhibWj9VlVVl7BxcDbC57qoNK5eU51HLy szzg== 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=tG2m9Eb/QpED6xZH5RNRbXGjt7iUmwaJQZ3O+bJSjik=; b=nETkvrmSdfCjyXvKICtXp04fzPKaAnii17uDMRYYeswBTxBcGeZ2D8cGNN8lwuU6DQ WdWesar/eeujruGiLpKo59kdddYEVWAjEV/tk6yvC0mYBLfZEuhQji9JCLVJr+GgEyCJ o7PXR1PDRz++EXbyt0j7HauLOfAo5N7HM2TFFP4CY4H+7yzl/HFQSm50fEYAhHmIc/ky 0IM8gyJJZtA8e61MEmNc6N7hw29/7BlNGUave3IgX7XxEa8YBPO5EELeCP8GClPO0CmD yJRPDaLESKEXLJOPw+MHqgSkBAExkJWZG48Z4OLjfyYiO32oq1G4uzlLkRoQwJdzW2Nt 0RYg== X-Gm-Message-State: AOAM533xs8ZQj3mFv/J5NfKS3r0qzlp3OmnX6/+qAETkH/hmZnjbU/N1 9wQodJb6hRc2JhoVYzqeL7oSGNnW2L9CXXC8NxbzPA== X-Google-Smtp-Source: ABdhPJw+4JDSXbihdqgsJkSuL8//ZtvxJUM8wlKiniYNNqTHvfUrkVgxPGBRldmFjZ8q9dfTi7kRwzN5Yb+/LJjoMl8= X-Received: by 2002:ac8:675a:: with SMTP id n26mr10097688qtp.101.1619897811859; Sat, 01 May 2021 12:36:51 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Sat, 1 May 2021 13:36:39 -0600 Message-ID: Subject: Re: Ports tree have been migrated to git To: Kurt Jaeger Cc: Li-Wen Hsu , git@freebsd.org X-Rspamd-Queue-Id: 4FXfd12rxDz4qcg X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.34 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, 01 May 2021 19:36:53 -0000 On Sat, May 1, 2021, 1:27 PM Kurt Jaeger wrote: > Hi! > > Thanks for posting more details. With some additional posts > in other places, I was finally able to understand most of the > workflow. > > I even use the testing area to test commits 8-} > > > - This is still a young service, please don't treat it too > > aggressively. The testing area is at: > > > > https://cgit-dev.freebsd.org/ports/ > > But right now I'm stuck with the following problem: > > I testbuild by having a default ports tree: > > $ poudriere ports -l > PORTSTREE METHOD TIMESTAMP PATH > default git+https 2021-05-01 21:04:04 /pou/ports/default > > Right now, for reasons that are unclear to me, I still have some > local commit hanging around in that tree that I can't get removed. > > I've used a lot of combinations of > > git rebase > git revert > git reset > > etc, short of removing and re-cloning that tree, because > I'm behind a slow DSL connection and it will take approx. 30minutes > to refetch that ports tree. > > Can someone please help me understand how to just get rid of > some commit not yet pushed ? > git reset --hard HEAD^ removes the last commit from the branch you have checked out. You can put any rev in place of HEAD^ if you know that is where you want to roll back to. You might use "freebsd/main" to reset to upstream (assuming you use the freebsd origin convention). Also, git reflog will remember, for a while, all the branch moves and you can use that to recover those local commits. Warner > -- > pi@FreeBSD.org +49 171 3101372 Now what ? > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" > From owner-freebsd-git@freebsd.org Sat May 1 19:50:18 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 44A5E636480 for ; Sat, 1 May 2021 19:50:18 +0000 (UTC) (envelope-from marklmi@yahoo.com) Received: from sonic308-55.consmr.mail.gq1.yahoo.com (sonic308-55.consmr.mail.gq1.yahoo.com [98.137.68.31]) (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 4FXfwT74t0z4r7T for ; Sat, 1 May 2021 19:50:17 +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=1619898616; bh=gQxWV0w20Mmgo0AHi2UKX4rTv2B/peZ0IcXqTmCYVbO=; h=X-Sonic-MF:Subject:From:Date:To:From:Subject; b=HnvxkbUaYqX5LXBl/lHm/WBRiGrlFTnThWJollFg4ZPoO/DY4XUc+D0KYRCwTX60QA4IEStBzHPEJs2s0IhRvp3oMKOB0KJd1UrVHNbVAoBgcQ7PZZpTchSL02WDBIK8YbYu5LycusoPe5d7HOFL6IQnK7omU5nzvG/clhXkyCe3102XBV3r7e/gbuaJWMNlPFPz6+yHGpykuyPctqWA0daLNaKfXyAISUOmlrY9w0b8rcdoOSJqwRNZzvBqDA3UFCya686XLyAWMHTTCsWS4uIkyUvGTF6gR0UkZDBS5T9w63d3pzjRVj36JOA0reCG5LDrHi8gH3YNy//7KwturQ== X-YMail-OSG: OKek.mAVM1mtvvhQnvPxlv4sf8HhIHA0bQAqzgf3tkQ2diBwM.rjiyfbse_byv4 8WCHnuXg7zrWPeu9LqZicOYUk8TClfWz3PVFviNsuebpGbL0T9hcFy2JcnHfbYJ8UjoGsv.Huqru WoClVFCdwTle.F5eapnU_7umdswwdJy_6wfQYSqLcLpOTjTTBu3LDBaNJDWKJKCITAXokbSW4rBZ u4vcHqkep9FAgnlu1ssh7xi448Atl6ac7wB6Vipx0wS14s0uTia71TY2fLUgccIIqQ87yT9Lz3xQ aWWX9LxXWIkOrJwxhCnfqOvUAl9nxL9M80el27m3.cdD.ZpqAqrp0kt6HGgnihcnUwgd1q_gGfRP CY8WDPPkmz9qdC9IKtW2VvFaYYxxfdsLVQKNHzfccjGe1wrSV8FMD2sJvpcDTDHfPge97XkMi2IV VW4vSaNoCAW8203.qBzFfn34vInYIPdWOg1K3ZNXp3EB777IY9YaGNXAUhEkDSUYfhQ9ENXcjHdu 7nL5Dp3.U7gqcQZKXDZEUiVTqQLSDQZ.XkhJGq8OCL38rjDHjjsGsNr.eko.PTKbZfRNvK2v8ik5 .JcY.P92wjM.nGeRc7HyOFD2Mefom5zbxQ3WiSLN_JO0mrAqsf1G3TeTKl8XBUYv2ljQLXIl_xj4 6elthNeezM7E926ThYTSUMfPIZUzE4JvjJweqnP7hLdJcg_e0B1CIJMwgarwxm2aGby9unts5RsJ j6eP6.EmnB2EHqc.NR1RtmEjBEnh3W6h79vipX2zw3KaAbxthNMrteUavE2mFCkWvaSfvF5uS_JC iqFVVh0GHWhwRgWXkGNFAduXA_42uCI0ePf5qa9FM1IkYHSymzg6E8HQ77wUDs9O9yOjpEAkk3J6 Xy2OruCJ261qEU.ujMPu_H9bBs9wi3GZqAXpdCZcKgoygrXJ_fvRRsN9if.YARGe8.1MO7AjLbqm CxRrWW6mAPM0rlOXhMxZqkBsQ02rtqfsuRyeIjTpCKMtv046IhPEjUNg9CjXi90A8BMJKTEuprZ6 92q0xhGF79YVZBmXZa6EYI8otMaV1sN5x1UOA1I5iadohvhhJoGbC72bNc45Br._K0W_RRO6xNpi zAiWZKINgl0Oa5W.51VVX_AZHo7z2CVhuxzNn9mV84vBNlGCWhym5CyO3Lcs_l6nFZV7LgLRLVZJ eIFSDwEbVlUJoXUqTpSqnxJ9tqWukpabs7ZQS1rlvN84zgqpD1I_c_oOsi4XjenBGdpA4srIO3lE CurCTORvhB17tkqSm7owcUT3D1BJd3aTaEiWTLTbigL4IrtRKXNJNzQKgZQk.UPEBvT5.7ovEkSx 4xNMAXh0Rl8TYmGefBF87zCWSkW4rAB5o3nk1Sm56.mVcYJ3Qp9Us9IhiBwOpYoRH.76GrbIHFNm NBaf0K4l8NSFZwhx2fR_rXGyn9NDuYZMpEYpU_nKt8JwI445kEPq6Yi8oie4ZFDOkjfVhBzwJwgF PdLKEyQ5vrDQCrvcUr.u6w5lGJWSvTvIZqd41ye5cI2z74LM8V5X2fmPDoqYdNCOhPzFlcE2M.du B6WsbgdNY8aHwteX.254DnDFFWgkj3jur_yjy6uN5NJgAjPYy7cuav6XY7ZWVCFmLF0nBpkrvDS4 wvQgXA49ZLnrttPg.zGCapsZznyDj20JogMFVuP7giOkiOPutAxjZbaEyeWqCgwEJBUQCMbPbs0E 74Ad9xf3qy_KdjOpsZVczk52II1XXxHleGwmNLireRB3ByufsuBwCQPpiM2CQRwjcBlY2PLOTar8 FtDC4ZA2o3skTet._cOa.iairg_ZEXXwP2UVAmlZBBSrO6rcQvdVMAmD3Y3K15nRl2UA4BSSpJcH TBRYfYIAEn4JMZFUHrPltNtJzOUSvQ1GB93w3FWfvMcwPu3U.2cKPrj1Z2paVzG9pPOw59hQXZ0l LuRjg2UX8NE3V8WyLAQAu3nTy9A.fLoE5y0_yT56K45ejWFQnzkevye6JxX0jCeL_FHQuCTaBwj8 CYHaML.Stk_QoZENsIt_uiCkSvgeFII_hH2QGuUhnli1HkwuZuvvZj3yIhM4YdODkQth7Pybv3MK IXdxCtTB_Ce3zFoiYUNxRGEXcAJmHzb6zTSHRYo38mdECVqF787.NuyNXqZVB6839Icvhuy8xVA0 X2QGqlth6ZD2NSf_6Jfv4Qn3OSX0qAoKQWPeCiswTd2MOMh5TIQo0yL6vw4Skq9oc28GSfVpbQMU J3fcKR1v2r1s6lWOo6NccpCKhyUp24N6XpMRyR7IB.hRH3bKUbHHIJJwNQ3kh9Bl7tjaWXz.rrLu 8lXSNJkKyNAyg5Las.tJT.cou9fOM9Ae6Q9wgmgzWZDCUqGMqNb8ZZZlo7.F3ZUNLkeIgjSEL0al dgcaCHVXMDD7XPt.vDOG.oZF3TeFC20_c7cao64i0BP5SIV0zcSoxBBTmWrX.RSMSMo9znnYM52m 9S3rcAdPhHoeIJjZM1UnoILos3T._xGqsGPJoKV74xf82EAz7Eqa.jKf28vcFnVBjoOnkPRYUH.T x5WdR5KMMQnFqSrsdet3IzuOPddNCc.vJENRKTPHckQu4Hq5IRiV0qqvqKnbTRDO3hUHbl1EnGTt ZYFGixnW0ZWv3HNL7zyNYlChVn9n_6NwesmnlDrSYd3hiv2bFeI9oweAdo.2R1l3imVnqxzGl6Ci ROHDHBC.sVRL_RK4Kwpcm3uSEJGLQaLyxN2r0lJrRmLRiHijC_4oFS6s6Pv2H1eevQ9A- X-Sonic-MF: Received: from sonic.gate.mail.ne1.yahoo.com by sonic308.consmr.mail.gq1.yahoo.com with HTTP; Sat, 1 May 2021 19:50:16 +0000 Received: by kubenode508.mail-prod1.omega.ne1.yahoo.com (VZM Hermes SMTP Server) with ESMTPA ID 5404461507336f11b64b67c0117f5011; Sat, 01 May 2021 19:50:12 +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: Script rmport shows error message From: Mark Millard In-Reply-To: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> Date: Sat, 1 May 2021 12:50:10 -0700 Cc: freebsd-git , "rene@freebsd.org" , Warner Losh Content-Transfer-Encoding: quoted-printable Message-Id: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> To: Matthias Fechner X-Mailer: Apple Mail (2.3654.60.0.2.21) X-Rspamd-Queue-Id: 4FXfwT74t0z4r7T 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, 01 May 2021 19:50:18 -0000 On 2021-May-1, at 10:07, Matthias Fechner = wrote: > I thought that the rmport script was already updated, but I cannot use = it. > I tried to execute it with: > Tools/scripts/rmport databases/rubygem-gitlab-pg_query > fatal: ambiguous argument 'remotes/origin/main': unknown revision or = path not in the working tree. > Use '--' to separate paths from revisions, like this: > 'git [...] -- [...]' > you have local commits, exiting Summary: ports/Tools/scripts/rmport does not yet seem to be set up to expect or try "remotes/freebsd/" instead of "remotes/origin/". Details: If you follow the documented instructions the refs for the ports main are (ignore any refs/ prefix): # git remote show freebsd # git show-ref --abbrev main a6233da12c53 refs/heads/main a6233da12c53 refs/remotes/freebsd/main If you are not set up to be a committer you might have something like: # git remote -v show freebsd ssh://anongit@git.freebsd.org/ports.git (fetch) freebsd ssh://anongit@git.freebsd.org/ports.git (push) (Where the push one is not intended to work and there are https:// alternatives to the ssh:// use.) You can use such commands to check on what is set up in your environment. This contrasts with the typical defaults, such as from another git context that I have (older github: so master instead of main): # git remote show origin # git remote -v show # output edited origin https://github.com/OMITTED/OMITTED.git (fetch) origin https://github.com/OMITTED/OMITTED.git (push) # git show-ref --abbrev master ae3f9ba refs/heads/master ae3f9ba refs/remotes/origin/master As for ports/Tools/scripts/rmport . . . # grep origin /usr/ports/Tools/scripts/rmport if ! ${GIT} diff --exit-code remotes/origin/main ; then # grep freebsd /usr/ports/Tools/scripts/rmport = url=3D"https://bugs.freebsd.org/bugzilla/buglist.cgi?quicksearch=3D${synop= sis}" So no attempt at use of remotes/freebsd/ use. Locally you could replace the "remotes/origin/" text in the script until there is official support for the documented way of setting things up. > But there are no local changes: > =E2=95=B0=E2=94=80 git status > On branch main > Your branch is up to date with 'freebsd/main'. >=20 > nothing to commit, working tree clean >=20 > The FreeBSD repository is under freebsd and not origin, maybe this is = the source of the problem: > =E2=95=B0=E2=94=80 git remote -v > freebsd https://git.freebsd.org/ports.git (fetch) > freebsd git@gitrepo.freebsd.org:ports.git (push) > origin git@gitlab.fechner.net:mfechner/Gitlab.git (fetch) > origin git@gitlab.fechner.net:mfechner/Gitlab.git (push) >=20 > Has anyone an idea how to fix/use this very useful script? >=20 =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar) From owner-freebsd-git@freebsd.org Sat May 1 20:08:54 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 0BB4F636A42 for ; Sat, 1 May 2021 20:08:54 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXgKx6zyYz4rnk for ; Sat, 1 May 2021 20:08:53 +0000 (UTC) (envelope-from pi@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id EE2EA636A41; Sat, 1 May 2021 20:08:53 +0000 (UTC) Delivered-To: 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 EDF14636A40 for ; Sat, 1 May 2021 20:08:53 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXgKx6Y0zz4rRy for ; Sat, 1 May 2021 20:08:53 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lcvv0-0009xS-6J; Sat, 01 May 2021 22:08:50 +0200 Date: Sat, 1 May 2021 22:08:50 +0200 From: Kurt Jaeger To: Warner Losh Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 4FXgKx6Y0zz4rRy 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: Sat, 01 May 2021 20:08:54 -0000 Hi! > > Right now, for reasons that are unclear to me, I still have some > > local commit hanging around in that tree that I can't get removed. [...] > > Can someone please help me understand how to just get rid of > > some commit not yet pushed ? > git reset --hard HEAD^ > > removes the last commit from the branch you have checked out. Ok, I applied this once and had the revert of my local commit removed. I then applied it a second time, and now a git show displays me the commit 9df78543e018a28c73fc97caff2c3ac9cc7b62f7 (the transcode revert from se@) as the last uncommitted (?) change in my poudriere ports tree. I expected 'git show' to return nothing, so that I know that my tree is in sync with the remote tree. > You can put > any rev in place of HEAD^ if you know that is where you want to roll back > to. I just want to be back in the state where git show does not show any changes 8-} > You might use "freebsd/main" to reset to upstream (assuming you use the > freebsd origin convention). I think I follow that convention, but: git reset --hard freebsd/main fatal: ambiguous argument 'freebsd/main': unknown revision or path not in the working tree. Use '--' to separate paths from revisions, like this: 'git [...] -- [...]' > Also, git reflog will remember, for a while, all the branch moves and you > can use that to recover those local commits. So reflog showed: [...] 01fbe73ae HEAD@{14}: reset: moving to HEAD 01fbe73ae HEAD@{15}: revert: Revert "net/dante: update 1.4.2 -> 1.4.3" 1f182d137 HEAD@{16}: reset: moving to HEAD 1f182d137 HEAD@{17}: reset: moving to HEAD and I tried to get to the state @ 1f182d137: which still is not the state I want to be in, because now git shows me 1f182d137defe95f4b4b46a3003f203957021a9d again. I'm really lost here 8-( Looks more and more like https://xkcd.com/1597/ -- pi@FreeBSD.org +49 171 3101372 Now what ? From owner-freebsd-git@freebsd.org Sat May 1 20:12:12 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 E153B636B36 for ; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXgPm5wTkz4rvV for ; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id CB39A6369E4; Sat, 1 May 2021 20:12:12 +0000 (UTC) Delivered-To: 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 CB039636872 for ; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXgPm5Nz9z4rdF; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 968884826; Sat, 1 May 2021 20:12:12 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (unknown [IPv6:2001:470:7a58:0:e0d3:13d5:7e22:8d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 3259C59CE3; Sat, 1 May 2021 22:12:11 +0200 (CEST) From: Dimitry Andric Message-Id: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.80.0.2.43\)) Subject: Re: Ports tree have been migrated to git Date: Sat, 1 May 2021 22:12:04 +0200 In-Reply-To: Cc: Warner Losh , git@freebsd.org To: Kurt Jaeger References: X-Mailer: Apple Mail (2.3654.80.0.2.43) 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, 01 May 2021 20:12:12 -0000 --Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 1 May 2021, at 22:08, Kurt Jaeger wrote: ... > I just want to be back in the state where git show does not show > any changes 8-} git checkout origin/main git branch -d main (you might have to use -D here if it doesn't want to = get rid of the branch) git checkout main And voila. -Dimitry --Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCYI22FAAKCRCwXqMKLiCW o0LgAJ43ZFQ47dyE6uDNIaUjb96WZul/gACg3TBO8oGfrjNwreCpFpYTI8Ge2ho= =d75o -----END PGP SIGNATURE----- --Apple-Mail=_B8F341A9-9E50-4189-AB7A-4A8BE175CEE8-- From owner-freebsd-git@freebsd.org Sat May 1 20:24:21 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 D317D636DFD for ; Sat, 1 May 2021 20:24:21 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXggn318Dz4sRG for ; Sat, 1 May 2021 20:24:20 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 141KOGXB012779; Sat, 1 May 2021 13:24:22 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Sat, 01 May 2021 13:24:16 -0700 From: Chris To: Mark Millard Cc: freebsd-git Subject: Re: Script rmport shows error message In-Reply-To: References: <8613e467-9408-527f-d8f0-81a6db0bdce9@freebsd.org> User-Agent: UDNSMS/17.0 Message-ID: <0cf94bc07be4340beddb38b924950585@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4FXggn318Dz4sRG X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:11404, ipnet:24.113.0.0/16, country:US]; local_wl_ip(0.00)[24.113.41.81] 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, 01 May 2021 20:24:21 -0000 On 2021-05-01 12:50, Mark Millard via freebsd-git wrote: > On 2021-May-1, at 10:07, Matthias Fechner wrote: > >> I thought that the rmport script was already updated, but I cannot use it. >> I tried to execute it with: >> Tools/scripts/rmport databases/rubygem-gitlab-pg_query >> fatal: ambiguous argument 'remotes/origin/main': unknown revision or path >> not in the working tree. >> Use '--' to separate paths from revisions, like this: >> 'git [...] -- [...]' >> you have local commits, exiting > > Summary: > > ports/Tools/scripts/rmport does not yet seem to be set up to > expect or try "remotes/freebsd/" instead of "remotes/origin/". > > Details: > > If you follow the documented instructions the refs > for the ports main are (ignore any refs/ prefix): > > # git remote show > freebsd > > # git show-ref --abbrev main > a6233da12c53 refs/heads/main > a6233da12c53 refs/remotes/freebsd/main > > If you are not set up to be a committer you might > have something like: > > # git remote -v show > freebsd ssh://anongit@git.freebsd.org/ports.git (fetch) > freebsd ssh://anongit@git.freebsd.org/ports.git (push) > > (Where the push one is not intended to work and there > are https:// alternatives to the ssh:// use.) > > You can use such commands to check on what is set up > in your environment. > > This contrasts with the typical defaults, such as from > another git context that I have (older github: so master > instead of main): > > # git remote show > origin > > # git remote -v show # output edited > origin https://github.com/OMITTED/OMITTED.git (fetch) > origin https://github.com/OMITTED/OMITTED.git (push) > > # git show-ref --abbrev master > ae3f9ba refs/heads/master > ae3f9ba refs/remotes/origin/master > > > As for ports/Tools/scripts/rmport . . . > > # grep origin /usr/ports/Tools/scripts/rmport > if ! ${GIT} diff --exit-code remotes/origin/main ; then > > # grep freebsd /usr/ports/Tools/scripts/rmport > url="https://bugs.freebsd.org/bugzilla/buglist.cgi?quicksearch=${synopsis}" > > So no attempt at use of remotes/freebsd/ use. > > Locally you could replace the "remotes/origin/" text > in the script until there is official support for > the documented way of setting things up. > >> But there are no local changes: >> ╰─ git status >> On branch main >> Your branch is up to date with 'freebsd/main'. >> >> nothing to commit, working tree clean >> >> The FreeBSD repository is under freebsd and not origin, maybe this is the >> source of the problem: >> ╰─ git remote -v >> freebsd https://git.freebsd.org/ports.git (fetch) >> freebsd git@gitrepo.freebsd.org:ports.git (push) >> origin git@gitlab.fechner.net:mfechner/Gitlab.git (fetch) >> origin git@gitlab.fechner.net:mfechner/Gitlab.git (push) >> >> Has anyone an idea how to fix/use this very useful script? Just wanted to send a big thank you, for taking the time to post all this, Mark. A big help for me too. :-) --Chris >> > > === > Mark Millard > marklmi at yahoo.com > ( dsl-only.net went > away in early 2018-Mar) > > _______________________________________________ > freebsd-git@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-git > To unsubscribe, send any mail to "freebsd-git-unsubscribe@freebsd.org" From owner-freebsd-git@freebsd.org Sat May 1 20:30:28 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 51E3B63731F for ; Sat, 1 May 2021 20:30:28 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXgpr1vVCz4s98 for ; Sat, 1 May 2021 20:30:28 +0000 (UTC) (envelope-from pi@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 4148863731E; Sat, 1 May 2021 20:30:28 +0000 (UTC) Delivered-To: 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 4112C6371DF for ; Sat, 1 May 2021 20:30:28 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from fc.opsec.eu (fc.opsec.eu [IPv6:2001:14f8:200:4::4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXgpr1QZZz4sP3; Sat, 1 May 2021 20:30:27 +0000 (UTC) (envelope-from pi@freebsd.org) Received: from pi by fc.opsec.eu with local (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lcwFs-000A0g-Rr; Sat, 01 May 2021 22:30:24 +0200 Date: Sat, 1 May 2021 22:30:24 +0200 From: Kurt Jaeger To: Dimitry Andric Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git Message-ID: References: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> X-Rspamd-Queue-Id: 4FXgpr1QZZz4sP3 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: Sat, 01 May 2021 20:30:28 -0000 Hi! > On 1 May 2021, at 22:08, Kurt Jaeger wrote: > ... > > I just want to be back in the state where git show does not show > > any changes 8-} > > git checkout origin/main > git branch -d main (you might have to use -D here if it doesn't want to get rid of the branch) > git checkout main > > And voila. # git checkout origin/main error: The following untracked working tree files would be overwritten by checkout: multimedia/transcode/files/patch-import_demux__pass.c multimedia/transcode/files/patch-import_extract__ac3.c multimedia/transcode/files/patch-import_extract__mp3.c multimedia/transcode/files/patch-import_extract__pcm.c [...] Please move or remove them before you switch branches. [...] Ok, I deleted those, but then git show shows me details of commit 7e1519526b60a1437ac59ecabc24fe7ff30fe127 (HEAD -> main, origin/main, origin/HEAD) I then tried the next step: $ git branch -d main error: Cannot delete branch 'main' checked out at '/pou/ports/default' $ git branch -D main error: Cannot delete branch 'main' checked out at '/pou/ports/default' It is really confusing, sorry. -- pi@FreeBSD.org +49 171 3101372 Now what ? From owner-freebsd-git@freebsd.org Sat May 1 20:32:21 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 E72E46374F5 for ; Sat, 1 May 2021 20:32:21 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from mailman.nyi.freebsd.org (mailman.nyi.freebsd.org [IPv6:2610:1c1:1:606c::50:13]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXgs146MQz4sZM for ; Sat, 1 May 2021 20:32:21 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: by mailman.nyi.freebsd.org (Postfix) id 8D09D63782A; Sat, 1 May 2021 20:32:21 +0000 (UTC) Delivered-To: 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 8CCCD6376E5 for ; Sat, 1 May 2021 20:32:21 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from udns.ultimatedns.net (static-24-113-41-81.wavecable.com [24.113.41.81]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "ultimatedns.net", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXgs11ykFz4smw; Sat, 1 May 2021 20:32:20 +0000 (UTC) (envelope-from bsd-lists@bsdforge.com) Received: from ultimatedns.net (localhost [127.0.0.1]) by udns.ultimatedns.net (8.16.1/8.16.1) with ESMTP id 141KWHQM063094; Sat, 1 May 2021 13:32:23 -0700 (PDT) (envelope-from bsd-lists@bsdforge.com) MIME-Version: 1.0 Date: Sat, 01 May 2021 13:32:17 -0700 From: Chris To: Kurt Jaeger Cc: git@freebsd.org Subject: Re: Ports tree have been migrated to git In-Reply-To: References: User-Agent: UDNSMS/17.0 Message-ID: <7f35bf2d90471e5f7b3daad893736605@bsdforge.com> X-Sender: bsd-lists@bsdforge.com Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4FXgs11ykFz4smw 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: Sat, 01 May 2021 20:32:22 -0000 On 2021-05-01 13:08, Kurt Jaeger wrote: > Hi! > >> > Right now, for reasons that are unclear to me, I still have some >> > local commit hanging around in that tree that I can't get removed. > [...] ... > > which still is not the state I want to be in, because now git > shows me > > 1f182d137defe95f4b4b46a3003f203957021a9d > > again. I'm really lost here 8-( Looks more and more like > > https://xkcd.com/1597/ WOOT! :-) Git -- Source Management like it's 1972! -- sccs(1) From owner-freebsd-git@freebsd.org Sat May 1 22:37:00 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 52A0F63B57A for ; Sat, 1 May 2021 22:37:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4FXkcr1nF8z3FbP for ; Sat, 1 May 2021 22:37:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 3A71063B627; Sat, 1 May 2021 22:37:00 +0000 (UTC) Delivered-To: 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 390A763B792 for ; Sat, 1 May 2021 22:37:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FXkcr0sgHz3FbN; Sat, 1 May 2021 22:37:00 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from tensor.andric.com (tensor.andric.com [IPv6:2001:470:7a58:1::1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "tensor.andric.com", Issuer "R3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id EC11B5234; Sat, 1 May 2021 22:36:59 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from smtpclient.apple (unknown [IPv6:2001:470:7a58:0:e0d3:13d5:7e22:8d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by tensor.andric.com (Postfix) with ESMTPSA id 1E36E5A030; Sun, 2 May 2021 00:36:58 +0200 (CEST) From: Dimitry Andric Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_45035E78-13DF-4FA5-997A-DB58B061B3E2"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.80.0.2.43\)) Subject: Re: Ports tree have been migrated to git Date: Sun, 2 May 2021 00:36:48 +0200 In-Reply-To: Cc: git@freebsd.org To: Kurt Jaeger References: <1772D08D-CE66-4285-B8EE-2A353E7B91E2@FreeBSD.org> X-Mailer: Apple Mail (2.3654.80.0.2.43) 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, 01 May 2021 22:37:00 -0000 --Apple-Mail=_45035E78-13DF-4FA5-997A-DB58B061B3E2 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 1 May 2021, at 22:30, Kurt Jaeger wrote: >=20 >> On 1 May 2021, at 22:08, Kurt Jaeger wrote: >> ... >>> I just want to be back in the state where git show does not show >>> any changes 8-} >>=20 >> git checkout origin/main >> git branch -d main (you might have to use -D here if it doesn't want = to get rid of the branch) >> git checkout main >>=20 >> And voila. >=20 > # git checkout origin/main > error: The following untracked working tree files would be overwritten = by checkout: > multimedia/transcode/files/patch-import_demux__pass.c > multimedia/transcode/files/patch-import_extract__ac3.c > multimedia/transcode/files/patch-import_extract__mp3.c > multimedia/transcode/files/patch-import_extract__pcm.c > [...] > Please move or remove them before you switch branches. > [...] Ah yes, I was assuming that you were starting with a clean tree. In this case you could have used "git stash" to stash away the changes, and get them back later. > Ok, I deleted those, but then >=20 > git show >=20 > shows me details of >=20 > commit 7e1519526b60a1437ac59ecabc24fe7ff30fe127 (HEAD -> main, = origin/main, origin/HEAD) >=20 > I then tried the next step: >=20 > $ git branch -d main > error: Cannot delete branch 'main' checked out at '/pou/ports/default' > $ git branch -D main > error: Cannot delete branch 'main' checked out at '/pou/ports/default' That means you are using worktrees, so indeed then you cannot delete the main branch, as that other location is using it. In this case you should probably use "git reset --hard", like Warner suggested. After using this, use a regular "git pull" to get your local main branch in sync with origin/main again. -Dimitry --Apple-Mail=_45035E78-13DF-4FA5-997A-DB58B061B3E2 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- Version: GnuPG/MacGPG2 v2.2 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCYI3YAAAKCRCwXqMKLiCW o+lPAJwIhzVLMZGfwnopfeA6Bj8u/luOjwCfVUKo7da3NBiVx6PYVxdySYDEzRA= =Lf5K -----END PGP SIGNATURE----- --Apple-Mail=_45035E78-13DF-4FA5-997A-DB58B061B3E2--