From owner-freebsd-git@freebsd.org Mon Nov 23 00:59:01 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id B8CE047AFBA for ; Mon, 23 Nov 2020 00:59:01 +0000 (UTC) (envelope-from dan@langille.org) Received: from new1-smtp.messagingengine.com (new1-smtp.messagingengine.com [66.111.4.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CfTLX5jNzz4gxH for ; Mon, 23 Nov 2020 00:59:00 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailnew.nyi.internal (Postfix) with ESMTP id 27D00580439; Sun, 22 Nov 2020 19:59:00 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 22 Nov 2020 19:59:00 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=fm2; bh=D DTH06UtiLx74SHG87u4tsMOWRoaBjUa5uOdHpXdLNE=; b=FPhjwylofBvHiRZ0Q CserpLKgAILgRQkHTbdGL6iSNdCZv4tGh5iO3nQWlwzBmjV6M2ovT21luON9H2K2 oD6XzEG3AATeM5hQDqeQSOfsN6ESHBcldnzyf51VJ9h6r9duJsW5qAI7UYLkPSAP 9SOlDE9MxR8LflRMKTBAHor5nGhsSswMHc8O8E8+X0y38ct6jKpGsTJ45ar9xafr XqT9L+O5nZZCnmTWNHe+yiAvTd1xuztNKO7hs/80lJWHsdlLhaRG5pciM7DVYSPA dvidHz5R01UcvA9eKMGNr/yiJlm7gVDWr/V1wIFVgH+kJkYUZuGqnaVe3MVgakG4 gR4Mw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding: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=fm1; bh=DDTH06UtiLx74SHG87u4tsMOWRoaBjUa5uOdHpXdL NE=; b=go20xya+d60owSLgUAGVAqALYzjCjkVgNamd5aNpzIYFFzvDHvO/Lk+kK EXnkubQbdDuILwRqNb+whkAb77F22W9XtX5pKbz7lcFwE2ISleZjKZmWWUu35fCA RwVIzsSwJcKE0nIIyzHlT1ba0dal2TKrDdD7M6FUfC9G9rM4afkgoQk6onnqrehb B0/sI07pLPHtm7X/8iXOcNGhfV8ZYaohbrncMGSSS3nYUv0v6qhkSWqVwER8NgZO Lx/BwN2kLGngZpWj6EPH/x3EKUbSE0QvyLM2hPhZS0WFqyWGIipn+p2JhgPEI8bG G+44JoMMOEQ2OM4rW2mfl98S4IpwA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeghedgvdehucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucgoofgvughsqdftgedtgedqtdeiucdlfedttddmne cujfgurheptggguffhjgffgffkfhfvofesthhqmhdthhdtvdenucfhrhhomhepffgrnhcu nfgrnhhgihhllhgvuceouggrnheslhgrnhhgihhllhgvrdhorhhgqeenucggtffrrghtth gvrhhnpefggeefjeduleehveduieegfefgvddutdelgfffjeegudduhefhleekudefueet hfenucffohhmrghinhepfhhrvghshhhpohhrthhsrdhorhhgnecukfhppeejvddrjeekrd duledtrdduledtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhf rhhomhepuggrnheslhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: from [10.222.78.31] (pool-72-78-190-190.phlapa.fios.verizon.net [72.78.190.190]) by mail.messagingengine.com (Postfix) with ESMTPA id C09F63280065; Sun, 22 Nov 2020 19:58:59 -0500 (EST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: Monitoring commits on all branches From: Dan Langille In-Reply-To: Date: Sun, 22 Nov 2020 19:58:59 -0500 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <6EA93D4C-B399-413D-8C35-224103CC48D6@langille.org> References: <197541CC-FEA7-4B4C-936E-66A5625BB64C@langille.org> <3c9f6285-ae7c-1062-2dd3-42f8c953a230@gmail.com> <93aa2a3e-7e8a-8199-3feb-6e464a590d72@gmail.com> <785f1386-f521-46d2-8e2e-a7c502fd943a@www.fastmail.com> To: Marc Branchaud X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CfTLX5jNzz4gxH X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=FPhjwylo; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=go20xya+; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.221 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.221]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.221:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FREEMAIL_TO(0.00)[gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[72.78.190.190:received]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.221:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[66.111.4.221:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.221:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; 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: Mon, 23 Nov 2020 00:59:01 -0000 Today I managed to sit down and go through the multiple scripts involved = in pulling in a commit. = https://news.freshports.org/2020/11/22/git-commit-processing-how-is-it-don= e/ Some changes were made.... > On Nov 21, 2020, at 2:06 PM, Marc Branchaud = wrote: >=20 > (trimmed some of the quoting) >=20 > On 2020-11-21 9:11 a.m., Dan Langille wrote: >> On Thu, Nov 19, 2020, at 5:30 PM, Marc Branchaud wrote: >>> Watch out with that "git checkout branch" part: This is where a lot = of >>> people get tripped up when they move from svn to git. It doesn't = help >>> that git tries to do some hand-holding here, but really git users = would >>> benefit from simply understanding how branch names are just labels = for >>> commit SHA IDs. Without that understanding, people end up going = down >>> the rabbit-hole that is the "git pull" command, a wretched hive of = scum >>> and villainy if there ever was one. >> I understand the concern and I think I follow. Within the confines = of >> 'only wanting the files for reference, never local modification', = pull and >> fetch might be the same for me. I'll look at fetch more. >=20 > "git fetch" is just the "get updates from the remote repo" part of = "git pull". >=20 > The thing with pull is that it wants to "help" you update your local = branches the "right" way. But the "right" way really depends on how you = work and how your project works. So most advice to "do a 'git pull'" is = only useful for the most general of cases. Commits on the quarterly branch are now being automatically processed. Now that the code is not doing 'git checkout master', which made sense = on master, things are going better. git fetch git checkout master git rebase $REMOTE/master Now its just doing: git pull git rev-list ..HEAD This seems to be working. However, that may change if I start doing local tags. > I consider "git pull" to be one of git's most advanced commands. It's = very powerful, and can certainly make life easier -- once you actually = understand how git works and how to configure pull to do what you = actually want. I always advise git beginners to stay away from using = pull until they have a firm grasp of git's branches and of how they want = to use them. >=20 > I personally never use "git pull" because I regularly want to use my = local branches in different ways, even within a single project/repo. I'll keep that in mind should I start using branches in different ways. >=20 >>> Looking through the set of hooks ("git help hooks"), I don't see >>> anything that would help you. >> My idea for a hook: FreeBSD tells FreshPorts when a new commit = arrives. >> FreshPorts wakes up and processes it. >=20 > That's certainly doable, though a bit unusual: Most "downstream" = projects fetch updates from their upstream. I was assuming you didn't = want any special consideration from the FreeBSD repositories. I am purposely avoiding the github commit hooks. They are too tied in... >=20 >>>> * Once branch exists, how do you find out about the commits when = you have no >>>> starting point for 'git log'? >>>=20 >>> Use "git merge-base" to find where the new branch split off from the >>> "master" or "main" branch. >> That is my starting commit for that branch? >=20 > No, it's the *parent* of your starting commit. >=20 > To list the SHA IDs of all the commits in the branch, do: >=20 > BASE=3D`git merge-base master..$BRANCH` > git rev-list $BASE..$BRANCH Thanks. >=20 >>> One last, small idea: Consider using tags in your local repos to = track >>> your $branch_last_hash. For example, after you finish processing = the >>> 2020Q4 branch, do >>> git tag -f last-2020Q4 origin/branches/2020Q4 >>> Then the next time through the 2020Q4 branch you can start at the >>> "last-2020Q4" tag. For a new branch that doesn't have a tag yet, = use >>> "git merge-base" to find the starting point. >> Tags in my local repos won't get things upset? >=20 > Not at all: tags are local in git -- just make sure to choose unique = tag names, since you don't want to collide with any tags your upstream = repo might use. Tags can be pushed to / fetched from other repos, but = since you're not updating the upstream FreeBSD repos (or any other = public repo, I assume) you can do anything you want with your tags. That may be for next weekend. =20 >> If I lose the local repo.... >=20 > That problem exists no matter how to choose to store state for your = scripts. >=20 > With git it's easy to backup your local repository, including its = tags: just "clone --mirror" it. Got it. --=20 Dan Langille - BSDCan / PGCon dan@langille.org From owner-freebsd-git@freebsd.org Mon Nov 23 01:48:00 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0C6C947BED4 for ; Mon, 23 Nov 2020 01:48:00 +0000 (UTC) (envelope-from dan@langille.org) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CfVR31n7Hz4jdB for ; Mon, 23 Nov 2020 01:47:59 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id D951B5C00B9; Sun, 22 Nov 2020 20:47:57 -0500 (EST) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Sun, 22 Nov 2020 20:47:57 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= content-type:mime-version:subject:from:in-reply-to:date:cc :content-transfer-encoding:message-id:references:to; s=fm2; bh=N +j4GQEjgiwkrtPgIEBNut3T137K6XDwX6Syy+iqqBM=; b=mfk8zwQJ2o+m7f6FJ 0WG+W78Nkv5BToYaH2OyntzkHi8lRtA3JyL9wVdHOPjM9SGeNII/Cxc2lFypl37x ENxrrDYXeomxHNz9RRhxuxxSBlOTcPBhMqpM8jqoKAIQGrZP38a2iyzYcVL+CyEY VKi2M8YqZPpmVtbeMA5oVSn6tJQbsz/mV7xoGjxz3suisLtwDjgpvqqdvhhCAmjp kWIDAMWrOle1mbeJHlTrQzByc8uBfOxU6uodRegmphCwbAJuZezMdjHl00qcp1Zo Xdmu3SjYYGBiLHd3YqiHqP0UJb7ts/Jo+G37o3Rdw9Xy0TTpuh6eteJfXoNHEWMI mPrqQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding: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=fm1; bh=N+j4GQEjgiwkrtPgIEBNut3T137K6XDwX6Syy+iqq BM=; b=mawQEgLljKQVhpkxZr28hlCbPKZWx+PsYnGitX8oUjYJIGLKBBMaBXIy1 C0X80INKEcKiH/djQUpwzm7Q1qJPhK5MRDjRhmvJS3NgOPvW0ANPWSE9o36myDMg AFDy+kxiTIdyS7Fps1yGahwrnTZNdfmCTc5KNymJ+V2d3JqP4ho32UjaXfoJrzAi w3zTLgQzImM0BSm95+f1sxS/qErrRMY9GVIJ9QMBMwsKgh4zFbUO7W7N7EsI8XS5 DlH4u1t/qQC0gE3EUkTT7HrXwaX73tyviudVKKaUkLAP7zEkxDFrG/y4D1zzc5w/ 9NFz+mEsCdOhrLTgTtJyUbNGkaIeA== X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudeghedgfeeiucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucenucfjughrpegtggfuhfgjfffgkfhfvffosehtqh hmtdhhtddvnecuhfhrohhmpeffrghnucfnrghnghhilhhlvgcuoegurghnsehlrghnghhi lhhlvgdrohhrgheqnecuggftrfgrthhtvghrnhepleduuefgveelkeejkeeuteekffdvhf etffdtveelgfeikeejvdehleekheffgeehnecuffhomhgrihhnpehfrhgvshhhphhorhht shdrohhrghdpghhithhhuhgsrdgtohhmnecukfhppeejvddrjeekrdduledtrdduledtne cuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepuggrnhes lhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: from [10.222.78.31] (pool-72-78-190-190.phlapa.fios.verizon.net [72.78.190.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 2813E328005D; Sun, 22 Nov 2020 20:47:57 -0500 (EST) Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: Re: Monitoring commits on all branches From: Dan Langille In-Reply-To: <6EA93D4C-B399-413D-8C35-224103CC48D6@langille.org> Date: Sun, 22 Nov 2020 20:47:56 -0500 Cc: freebsd-git@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <9B99AE2C-0497-432F-823B-290FDF53233C@langille.org> References: <197541CC-FEA7-4B4C-936E-66A5625BB64C@langille.org> <3c9f6285-ae7c-1062-2dd3-42f8c953a230@gmail.com> <93aa2a3e-7e8a-8199-3feb-6e464a590d72@gmail.com> <785f1386-f521-46d2-8e2e-a7c502fd943a@www.fastmail.com> <6EA93D4C-B399-413D-8C35-224103CC48D6@langille.org> To: Marc Branchaud X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CfVR31n7Hz4jdB X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=mfk8zwQJ; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=mawQEgLl; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.26 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.26]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.26:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FREEMAIL_TO(0.00)[gmail.com]; RECEIVED_SPAMHAUS_PBL(0.00)[72.78.190.190:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.26:from]; ARC_NA(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.26:from]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; SPAMHAUS_ZRD(0.00)[66.111.4.26:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; 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: Mon, 23 Nov 2020 01:48:00 -0000 > On Nov 22, 2020, at 7:58 PM, Dan Langille wrote: >=20 > Today I managed to sit down and go through the multiple scripts = involved in pulling in a commit. >=20 > = https://news.freshports.org/2020/11/22/git-commit-processing-how-is-it-don= e/ >=20 > Some changes were made.... >=20 >> On Nov 21, 2020, at 2:06 PM, Marc Branchaud = wrote: >>=20 >> (trimmed some of the quoting) >>=20 >> On 2020-11-21 9:11 a.m., Dan Langille wrote: >>> On Thu, Nov 19, 2020, at 5:30 PM, Marc Branchaud wrote: >>>> Watch out with that "git checkout branch" part: This is where a lot = of >>>> people get tripped up when they move from svn to git. It doesn't = help >>>> that git tries to do some hand-holding here, but really git users = would >>>> benefit from simply understanding how branch names are just labels = for >>>> commit SHA IDs. Without that understanding, people end up going = down >>>> the rabbit-hole that is the "git pull" command, a wretched hive of = scum >>>> and villainy if there ever was one. >>> I understand the concern and I think I follow. Within the confines = of >>> 'only wanting the files for reference, never local modification', = pull and >>> fetch might be the same for me. I'll look at fetch more. >>=20 >> "git fetch" is just the "get updates from the remote repo" part of = "git pull". >>=20 >> The thing with pull is that it wants to "help" you update your local = branches the "right" way. But the "right" way really depends on how you = work and how your project works. So most advice to "do a 'git pull'" is = only useful for the most general of cases. >=20 > Commits on the quarterly branch are now being automatically processed. >=20 > Now that the code is not doing 'git checkout master', which made sense = on master, things are going better. >=20 > git fetch > git checkout master > git rebase $REMOTE/master >=20 > Now its just doing: >=20 > git pull > git rev-list ..HEAD >=20 > This seems to be working. >=20 > However, that may change if I start doing local tags. I just tried this. While I understand the issue around=20 [dan@devgit-ingress01:~/src/freebsd/freebsd-ports] $ git fetch remote: Enumerating objects: 220, done. remote: Counting objects: 100% (194/194), done. remote: Compressing objects: 100% (60/60), done. remote: Total 111 (delta 60), reused 100 (delta 49), pack-reused 0 Receiving objects: 100% (111/111), 18.38 KiB | 4.59 MiB/s, done. Resolving deltas: 100% (60/60), completed with 36 local objects. =46rom https://github.com/freebsd/freebsd-ports 24a927a0ef5d..bba44fef62c0 master -> origin/master e3989b2f380e..9944c9cd2c35 branches/2020Q4 -> origin/branches/2020Q4 7c20845bd227..430121ca5ac7 svn_head -> origin/svn_head OK, I see how I might be able to use that output, I can see which = branches have new commits. [dan@devgit-ingress01:~/src/freebsd/freebsd-ports] $ git merge Updating 24a927a0ef5d..bba44fef62c0 Fast-forward audio/hpsjam/Makefile = | 2 +- audio/hpsjam/distinfo = | 6 +- devel/Makefile = | 1 + devel/php80-intl/files/patch-icu68 = | 222 ---------------------------------------- devel/py-pytest-datadir/Makefile = | 27 +++++ devel/py-pytest-datadir/distinfo = | 3 + devel/py-pytest-datadir/pkg-descr = | 4 + graphics/tiled/Makefile = | 7 +- graphics/tiled/distinfo = | 6 +- graphics/tiled/pkg-plist = | 4 + irc/irssi/Makefile = | 81 +++++++-------- irc/irssi/distinfo = | 6 +- irc/irssi/files/patch-Makefile.in = | 22 ---- irc/irssi/files/patch-configure.ac = | 15 --- irc/irssi/files/patch-meson.build = | 22 ++++ irc/irssi/files/patch-perl-Makefile = | 22 ---- irc/irssi/pkg-plist = | 10 +- lang/php80/Makefile = | 2 +- lang/php80/distinfo = | 6 +- mail/mutt/Makefile = | 2 +- mail/mutt/distinfo = | 6 +- multimedia/mpv/Makefile = | 33 +++--- multimedia/mpv/distinfo = | 10 +- multimedia/mpv/pkg-plist = | 4 +- net-im/signal-cli/Makefile = | 13 +-- net-im/signal-cli/distinfo = | 14 +-- net-im/signal-cli/pkg-plist = | 4 +- net/fb303/Makefile = | 16 ++- net/fb303/distinfo = | 6 +- net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake = | 2 +- net/fb303/files/patch-fb303_thrift_CMakeLists.txt = | 22 ---- net/fb303/pkg-plist = | 4 +- net/geoipupdate/Makefile = | 23 +++-- net/geoipupdate/distinfo = | 18 +++- net/geoipupdate/files/patch-Makefile = | 13 ++- net/netatalk3/Makefile = | 2 +- net/netatalk3/files/patch-etc_afpd_volume.c = | 20 ++++ net/netatalk3/files/patch-libatalk_vfs_extattr.c = | 19 ++++ sysutils/rpi-firmware/Makefile = | 4 +- sysutils/rpi-firmware/distinfo = | 6 +- sysutils/rpi-firmware/pkg-plist = | 4 +- 41 files changed, 265 insertions(+), 448 deletions(-) delete mode 100644 devel/php80-intl/files/patch-icu68 create mode 100644 devel/py-pytest-datadir/Makefile create mode 100644 devel/py-pytest-datadir/distinfo create mode 100644 devel/py-pytest-datadir/pkg-descr delete mode 100644 irc/irssi/files/patch-Makefile.in delete mode 100644 irc/irssi/files/patch-configure.ac create mode 100644 irc/irssi/files/patch-meson.build delete mode 100644 irc/irssi/files/patch-perl-Makefile delete mode 100644 net/fb303/files/patch-fb303_thrift_CMakeLists.txt create mode 100644 net/netatalk3/files/patch-etc_afpd_volume.c create mode 100644 net/netatalk3/files/patch-libatalk_vfs_extattr.c That output might also be useful for knowing what ports are affected, = but really, this is what brings everything in. '24a927a0ef5d' is taken from the 'git fetch' output but would also be = the LAST_COMMIT for this branch. [dan@devgit-ingress01:~/src/freebsd/freebsd-ports] $ git rev-list = 24a927a0ef5d..HEAD bba44fef62c062bf942dd5312128b43dbd813dcf 6a1e09447b223d078f78f7a7a9072e9842343c76 dffe7ea4b193785b7309dd161e76e9d626e12b96 f1a85af087281cfc6cd117301d7932472bd51adc 2cbf3d698dc5e2d265c8f58447f5dea3e0a9b7ee e9e1f60c3603041bcca9dda1e95918dbfcd3e480 352ce94919051329b591ef3534541f3138e52be7 0140eb70289386ad0d2b5a660ae1108a2c6eed45 e273657ca09b1d2c862b24eb1154789f24e69ea6 7a79ec535067cd83fde3b8800509680cf1e60a27 182883a91022b14581cd951a733fd7ca1538ba73 494e0eafb5c57aadf36e6ef911f922169152cf1a c1ff2a4159b9fd8d2199bb908a4facfb9b0e6399 Next, I tried a tag, but went over to the freebsd source repo, because = it has more recent commits. Command output is not shown. [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git tag = freshports_last_commit [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git fetch [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git merge [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git rev-list = freshports_last_commit..HEAD 5902bf651a44a052969477e3ed4ee0c382dd7b90 a0e591191ab3d906d2d3d1a6985d424513c69c70 8a81e9904d4c3bf58328345f958f5fa5ac3d0801 9c6918af8b7927e77d829b7226c456415c029bdf 6006818f9acd67f5b45d262ec949f0403b34100d bdbb0128dce50974d8140ad511a1a895db205ece bf39ccedb1130d2041d937ab6bfa0e6d32f10b68 df7e32b0f26fd7500b7c1360071ed323fb5b7639 236ac76160e57a74747dc4453961fe5bbd18d7fb 4b194b2e1ccbeb53c7b1a22169fdbcb79ef985ea e8a0e692d11de506b18de046891293a5d03f15e2 45011cba53a65bbcaeb91dba13798d49387f34b3 2af377ccd66ed48f2ac8c3677fddfd6ad2608a7b d97705ee7cb3e6405dd60a1d6f03d9737754593a dbc3ee07f871a067e0d72d3463992370879a4372 7f2206c5a9f89d5e47cce05b79cfeead2b6598f5 2241a9b4d5b35fb0fb9ea0eb0f87dc7f0463edc3 b766790d1f5c8304463537f537a6955f1e0df442 cbc574bf4544f824705626383f9bef33d9a26089 3cc7c8abf47a2558fa0f1179905814ee167257b9 5844c0bcff59fd35dc2e0906bb696b17289e5e5c e6e213967ba710191f3d5d912c9ecf70d7e26b8a 1dab84551f51bf73e9653559dd7c4aff547719b4 50db1dd05447122f5d2c1f2b60e9bab771294bea After the last commit is processed, this gets done: $ git tag freshports_last_commit fatal: tag 'freshports_last_commit' already exists Oops: $ git tag -f freshports_last_commit Updated tag 'freshports_last_commit' (was 4a90ed0de4e) A compromise might be just logging the last commit somewhere so it can = be derived easily if all is lost. Mind you, this might be the same thing. SELECT hash FROM commit_log order by id desc limit 1 .. assuming everything gets inserted into the database in the correct = order. That might work. Just go back a few dozens commits and use that value. = If we reprocess commits, no bit deal. They get ignored if already in = the database. --=20 Dan Langille - BSDCan / PGCon dan@langille.org From owner-freebsd-git@freebsd.org Mon Nov 23 19:43:36 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ADE9646B183 for ; Mon, 23 Nov 2020 19:43:36 +0000 (UTC) (envelope-from marcnarc@gmail.com) 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 4CfyJ8036Vz4j7r for ; Mon, 23 Nov 2020 19:43:35 +0000 (UTC) (envelope-from marcnarc@gmail.com) Received: by mail-qv1-xf2f.google.com with SMTP id k3so2551627qvz.4 for ; Mon, 23 Nov 2020 11:43:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=9fDbH+a2Yq9FewmvvPrqw4CWCOihogLy8MOfMEFA2mk=; b=W5rYGR22UGlqlFnbP0HR1rnspgQYzvisX/DmhUJLjeya2z6izdZ/9mGcjx5GRmY7vj wSRQBAZVQZcrBpHYscYMMXlEMaUXJH2lOBgwnj0cX86Qo6ZqOBrqUiXJOMWePDgDobVa H6XjN33eZekZcMXgSEPJfi5nXp3OUnoOosIIK3QGp0L9d1Bh0V96wi1RLT1n2JVZVWUL bIwtpufdAn1FuT9f/Uchkhz0o4Q9y9NR+zu7dd8VBI2e4jKQxeN/3bnxFIZD0O4pdXD3 rVgrDi7oPH3b62S5BIlQ9CQHM3vMqJiy2vB6L25EJ+Upu87M/1EdJ2CYvvZqFbqD1OW9 B67g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=9fDbH+a2Yq9FewmvvPrqw4CWCOihogLy8MOfMEFA2mk=; b=myl4ONby92n9TzwKlFhKpFTZJRFPfXDN6W5me2chvqQoBGkS/DC7p+T5M3gHi+YiWr AyDTumyP6hmL1ud1RjneedvmTVVwBRqMu4aUGt3QJofXx1OjvRqiIbRnkeYpytT3J6X4 GzNjv5zT649Tt0GNRn2M41XNkSu2FgjLqaSuXHAwJcEvvHlpk0EfnYAv0CgYFEBCixys 7TRg2AYYY4koJIeMH54YuPyG4v8E4K6P7wZk8SfnSEQQn0Jvuf+F0eq2CC7+hFQR8G6i XOPxVtogGmON2UuaaLd6ZVk7PG2y4WrQMDehAq/UD4KaywAr5dq111LCun4xw5z74Ef5 6F7w== X-Gm-Message-State: AOAM532KOTzr3/B3vYKvAH/jNfrtvBxECwdzoc8Qwq9FdInw7A1mE/3J oOGwbrWBJqTmc2pKLHSbcXPlv1n4iAdkRsNj X-Google-Smtp-Source: ABdhPJz886ZfKo8ouiBQ32Rp5vv2H44j49XfMzSvZRT6n7tKimYATF8W1TEeyu+7GtqtkPNIXsHNHA== X-Received: by 2002:a0c:c290:: with SMTP id b16mr1008056qvi.53.1606160615174; Mon, 23 Nov 2020 11:43:35 -0800 (PST) Received: from [192.168.222.18] (192-222-183-158.qc.cable.ebox.net. [192.222.183.158]) by smtp.gmail.com with ESMTPSA id y35sm11511446qty.58.2020.11.23.11.43.33 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 23 Nov 2020 11:43:34 -0800 (PST) Subject: Re: Monitoring commits on all branches To: Dan Langille Cc: freebsd-git@freebsd.org References: <197541CC-FEA7-4B4C-936E-66A5625BB64C@langille.org> <3c9f6285-ae7c-1062-2dd3-42f8c953a230@gmail.com> <93aa2a3e-7e8a-8199-3feb-6e464a590d72@gmail.com> <785f1386-f521-46d2-8e2e-a7c502fd943a@www.fastmail.com> <6EA93D4C-B399-413D-8C35-224103CC48D6@langille.org> <9B99AE2C-0497-432F-823B-290FDF53233C@langille.org> From: Marc Branchaud Message-ID: Date: Mon, 23 Nov 2020 14:43:33 -0500 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.3.2 MIME-Version: 1.0 In-Reply-To: <9B99AE2C-0497-432F-823B-290FDF53233C@langille.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit X-Rspamd-Queue-Id: 4CfyJ8036Vz4j7r X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=gmail.com header.s=20161025 header.b=W5rYGR22; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (mx1.freebsd.org: domain of marcnarc@gmail.com designates 2607:f8b0:4864:20::f2f as permitted sender) smtp.mailfrom=marcnarc@gmail.com X-Spamd-Result: default: False [-4.00 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip6:2607:f8b0:4000::/36:c]; FREEMAIL_FROM(0.00)[gmail.com]; RCVD_COUNT_THREE(0.00)[3]; DKIM_TRACE(0.00)[gmail.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[gmail.com,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[2607:f8b0:4864:20::f2f:from]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[gmail.com:s=20161025]; FROM_HAS_DN(0.00)[]; DWL_DNSWL_NONE(0.00)[gmail.com:dkim]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; SPAMHAUS_ZRD(0.00)[2607:f8b0:4864:20::f2f:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2f:from]; RCVD_TLS_ALL(0.00)[]; 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: Mon, 23 Nov 2020 19:43:36 -0000 On 2020-11-22 8:47 p.m., Dan Langille wrote: >> On Nov 22, 2020, at 7:58 PM, Dan Langille wrote: >> >> Today I managed to sit down and go through the multiple scripts involved in pulling in a commit. >> >> https://news.freshports.org/2020/11/22/git-commit-processing-how-is-it-done/ >> >> Some changes were made.... >> >>> On Nov 21, 2020, at 2:06 PM, Marc Branchaud wrote: >>> >>> (trimmed some of the quoting) >>> >>> On 2020-11-21 9:11 a.m., Dan Langille wrote: >>>> On Thu, Nov 19, 2020, at 5:30 PM, Marc Branchaud wrote: >>>>> Watch out with that "git checkout branch" part: This is where a lot of >>>>> people get tripped up when they move from svn to git. It doesn't help >>>>> that git tries to do some hand-holding here, but really git users would >>>>> benefit from simply understanding how branch names are just labels for >>>>> commit SHA IDs. Without that understanding, people end up going down >>>>> the rabbit-hole that is the "git pull" command, a wretched hive of scum >>>>> and villainy if there ever was one. >>>> I understand the concern and I think I follow. Within the confines of >>>> 'only wanting the files for reference, never local modification', pull and >>>> fetch might be the same for me. I'll look at fetch more. >>> >>> "git fetch" is just the "get updates from the remote repo" part of "git pull". >>> >>> The thing with pull is that it wants to "help" you update your local branches the "right" way. But the "right" way really depends on how you work and how your project works. So most advice to "do a 'git pull'" is only useful for the most general of cases. >> >> Commits on the quarterly branch are now being automatically processed. Glad to hear you've made some progress! >> Now that the code is not doing 'git checkout master', which made sense on master, things are going better. >> >> git fetch >> git checkout master >> git rebase $REMOTE/master >> >> Now its just doing: >> >> git pull >> git rev-list ..HEAD >> >> This seems to be working. >> >> However, that may change if I start doing local tags. > > I just tried this. > > While I understand the issue around > > [dan@devgit-ingress01:~/src/freebsd/freebsd-ports] $ git fetch > remote: Enumerating objects: 220, done. > remote: Counting objects: 100% (194/194), done. > remote: Compressing objects: 100% (60/60), done. > remote: Total 111 (delta 60), reused 100 (delta 49), pack-reused 0 > Receiving objects: 100% (111/111), 18.38 KiB | 4.59 MiB/s, done. > Resolving deltas: 100% (60/60), completed with 36 local objects. > From https://github.com/freebsd/freebsd-ports > 24a927a0ef5d..bba44fef62c0 master -> origin/master > e3989b2f380e..9944c9cd2c35 branches/2020Q4 -> origin/branches/2020Q4 > 7c20845bd227..430121ca5ac7 svn_head -> origin/svn_head > > > OK, I see how I might be able to use that output, I can see which branches have new commits. > > > [dan@devgit-ingress01:~/src/freebsd/freebsd-ports] $ git merge > Updating 24a927a0ef5d..bba44fef62c0 > Fast-forward FYI, the "Fast-forward" here is git's way of saying "The branch you currently have checked-out did not add any new commits compared to the remote repo's version of the branch, so I'm just going to make your checked-out branch point to the same commit as on the remote repo." A "fast-forward" merge means that git did not do any patch-like operations to combine different sets of code changes. > audio/hpsjam/Makefile | 2 +- > audio/hpsjam/distinfo | 6 +- > devel/Makefile | 1 + > devel/php80-intl/files/patch-icu68 | 222 ---------------------------------------- > devel/py-pytest-datadir/Makefile | 27 +++++ > devel/py-pytest-datadir/distinfo | 3 + > devel/py-pytest-datadir/pkg-descr | 4 + > graphics/tiled/Makefile | 7 +- > graphics/tiled/distinfo | 6 +- > graphics/tiled/pkg-plist | 4 + > irc/irssi/Makefile | 81 +++++++-------- > irc/irssi/distinfo | 6 +- > irc/irssi/files/patch-Makefile.in | 22 ---- > irc/irssi/files/patch-configure.ac | 15 --- > irc/irssi/files/patch-meson.build | 22 ++++ > irc/irssi/files/patch-perl-Makefile | 22 ---- > irc/irssi/pkg-plist | 10 +- > lang/php80/Makefile | 2 +- > lang/php80/distinfo | 6 +- > mail/mutt/Makefile | 2 +- > mail/mutt/distinfo | 6 +- > multimedia/mpv/Makefile | 33 +++--- > multimedia/mpv/distinfo | 10 +- > multimedia/mpv/pkg-plist | 4 +- > net-im/signal-cli/Makefile | 13 +-- > net-im/signal-cli/distinfo | 14 +-- > net-im/signal-cli/pkg-plist | 4 +- > net/fb303/Makefile | 16 ++- > net/fb303/distinfo | 6 +- > net/fb303/files/patch-build_fbcode__builder_CMake_FBThriftLibrary.cmake | 2 +- > net/fb303/files/patch-fb303_thrift_CMakeLists.txt | 22 ---- > net/fb303/pkg-plist | 4 +- > net/geoipupdate/Makefile | 23 +++-- > net/geoipupdate/distinfo | 18 +++- > net/geoipupdate/files/patch-Makefile | 13 ++- > net/netatalk3/Makefile | 2 +- > net/netatalk3/files/patch-etc_afpd_volume.c | 20 ++++ > net/netatalk3/files/patch-libatalk_vfs_extattr.c | 19 ++++ > sysutils/rpi-firmware/Makefile | 4 +- > sysutils/rpi-firmware/distinfo | 6 +- > sysutils/rpi-firmware/pkg-plist | 4 +- > 41 files changed, 265 insertions(+), 448 deletions(-) > delete mode 100644 devel/php80-intl/files/patch-icu68 > create mode 100644 devel/py-pytest-datadir/Makefile > create mode 100644 devel/py-pytest-datadir/distinfo > create mode 100644 devel/py-pytest-datadir/pkg-descr > delete mode 100644 irc/irssi/files/patch-Makefile.in > delete mode 100644 irc/irssi/files/patch-configure.ac > create mode 100644 irc/irssi/files/patch-meson.build > delete mode 100644 irc/irssi/files/patch-perl-Makefile > delete mode 100644 net/fb303/files/patch-fb303_thrift_CMakeLists.txt > create mode 100644 net/netatalk3/files/patch-etc_afpd_volume.c > create mode 100644 net/netatalk3/files/patch-libatalk_vfs_extattr.c > > That output might also be useful for knowing what ports are affected, but really, this is what brings everything in. You can get also that output when comparing any two commits in the repo, with "git diff --stat" (or "git diff --numstat" for a more parsable format): git diff --numstat 24a927a0ef5d origin/branches/2020Q4 > '24a927a0ef5d' is taken from the 'git fetch' output but would also be the LAST_COMMIT for this branch. > > [dan@devgit-ingress01:~/src/freebsd/freebsd-ports] $ git rev-list 24a927a0ef5d..HEAD > bba44fef62c062bf942dd5312128b43dbd813dcf > 6a1e09447b223d078f78f7a7a9072e9842343c76 > dffe7ea4b193785b7309dd161e76e9d626e12b96 > f1a85af087281cfc6cd117301d7932472bd51adc > 2cbf3d698dc5e2d265c8f58447f5dea3e0a9b7ee > e9e1f60c3603041bcca9dda1e95918dbfcd3e480 > 352ce94919051329b591ef3534541f3138e52be7 > 0140eb70289386ad0d2b5a660ae1108a2c6eed45 > e273657ca09b1d2c862b24eb1154789f24e69ea6 > 7a79ec535067cd83fde3b8800509680cf1e60a27 > 182883a91022b14581cd951a733fd7ca1538ba73 > 494e0eafb5c57aadf36e6ef911f922169152cf1a > c1ff2a4159b9fd8d2199bb908a4facfb9b0e6399 > > > Next, I tried a tag, but went over to the freebsd source repo, because it has more recent commits. > > Command output is not shown. > > [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git tag freshports_last_commit > [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git fetch > [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git merge > [dan@devgit-ingress01:~/src/freebsd/freebsd] $ git rev-list freshports_last_commit..HEAD > 5902bf651a44a052969477e3ed4ee0c382dd7b90 > a0e591191ab3d906d2d3d1a6985d424513c69c70 > 8a81e9904d4c3bf58328345f958f5fa5ac3d0801 > 9c6918af8b7927e77d829b7226c456415c029bdf > 6006818f9acd67f5b45d262ec949f0403b34100d > bdbb0128dce50974d8140ad511a1a895db205ece > bf39ccedb1130d2041d937ab6bfa0e6d32f10b68 > df7e32b0f26fd7500b7c1360071ed323fb5b7639 > 236ac76160e57a74747dc4453961fe5bbd18d7fb > 4b194b2e1ccbeb53c7b1a22169fdbcb79ef985ea > e8a0e692d11de506b18de046891293a5d03f15e2 > 45011cba53a65bbcaeb91dba13798d49387f34b3 > 2af377ccd66ed48f2ac8c3677fddfd6ad2608a7b > d97705ee7cb3e6405dd60a1d6f03d9737754593a > dbc3ee07f871a067e0d72d3463992370879a4372 > 7f2206c5a9f89d5e47cce05b79cfeead2b6598f5 > 2241a9b4d5b35fb0fb9ea0eb0f87dc7f0463edc3 > b766790d1f5c8304463537f537a6955f1e0df442 > cbc574bf4544f824705626383f9bef33d9a26089 > 3cc7c8abf47a2558fa0f1179905814ee167257b9 > 5844c0bcff59fd35dc2e0906bb696b17289e5e5c > e6e213967ba710191f3d5d912c9ecf70d7e26b8a > 1dab84551f51bf73e9653559dd7c4aff547719b4 > 50db1dd05447122f5d2c1f2b60e9bab771294bea > > After the last commit is processed, this gets done: > > $ git tag freshports_last_commit > fatal: tag 'freshports_last_commit' already exists > > Oops: > > $ git tag -f freshports_last_commit > Updated tag 'freshports_last_commit' (was 4a90ed0de4e) > > A compromise might be just logging the last commit somewhere so it can be derived easily if all is lost. > > Mind you, this might be the same thing. > > SELECT hash FROM commit_log order by id desc limit 1 > > .. assuming everything gets inserted into the database in the correct order. > > That might work. Just go back a few dozens commits and use that value. If we reprocess commits, no bit deal. They get ignored if already in the database. You should do whatever works for you, of course. Storing your script's state within your git repo is just one option. M. From owner-freebsd-git@freebsd.org Tue Nov 24 16:33:23 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id EC3622E98E6 for ; Tue, 24 Nov 2020 16:33:23 +0000 (UTC) (envelope-from mat@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CgV2C6Ljvz4wG2; Tue, 24 Nov 2020 16:33:23 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from mail.j.mat.cc (owncloud.cube.mat.cc [79.143.240.228]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.mat.cc", Issuer "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id B1D022C3D3; Tue, 24 Nov 2020 16:33:23 +0000 (UTC) (envelope-from mat@freebsd.org) Received: from aching.in.mat.cc (unknown [IPv6:2a01:678:42:0:bdf4:2e83:8ff:e8ad]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: mat@mat.cc) by mail.j.mat.cc (Postfix) with ESMTPSA id 70798942D84; Tue, 24 Nov 2020 16:33:21 +0000 (UTC) Date: Tue, 24 Nov 2020 17:33:20 +0100 From: Mathieu Arnold To: Dan Langille Cc: freebsd-git@freebsd.org Subject: Re: Monitoring commits on all branches Message-ID: <20201124163320.saytu6spw42v6fnd@aching.in.mat.cc> References: <197541CC-FEA7-4B4C-936E-66A5625BB64C@langille.org> <20201119085223.nsrp2e45oyepsvds@aching.in.mat.cc> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ntqidtvwvhfysqlt" Content-Disposition: inline In-Reply-To: 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: Tue, 24 Nov 2020 16:33:24 -0000 --ntqidtvwvhfysqlt Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Nov 19, 2020 at 12:45:14PM -0500, Dan Langille wrote: > > On Nov 19, 2020, at 3:52 AM, Mathieu Arnold wrote: > >=20 > > On Wed, Nov 18, 2020 at 08:49:46PM -0500, Dan Langille wrote: > >> How can a repo be monitored for commits on all branches? > >>=20 > >> I know how to ask a given branch: do you have any commits after foo_ha= sh? > >>=20 > >> How do I: > >>=20 > >> * get a list of all commits since foo_hash > >=20 > > All commits on the branch foo_hash is: > >=20 > > git log $foo_hash...branch_name >=20 > So, branch_name, not HEAD as others have mentioned? >=20 > e.g. : git log $foo_hash..HEAD =46rom what I understood, freshports never needs to be able to access files on the top of a branch, it only needs to access the files on specific commits (the fact that a commit is at the top of the branch is only an artefact of the process). So, you never need to checkout any branches, you only need to checkout commits. So you never have a HEAD that points to a branch, HEAD is always in a detached state and points to a commit. So what you need to do is, git clone the repository, and then, each time the script runs, do (in somewhat shell script): ############################# NAME_OF_REMOTE=3Dorigin NAME_OF_HEAD=3Dmain cd /where/the/repo/is git fetch # get all references (so, branches, tags, and so one) and keep only # branches (named commits here) that the remote repository has git for-each-ref --format '%(objecttype) %(refname)' \ | sed -n 's/^commit refs\/remotes\///p' | while read -r type refname do # If we don't have the tag, it means we have not encountered the # branch yet. if ! git tag -l freshports/$refname then # get the first commit of that branch and create a tag. git tag -m "first known commit of $refname" -f freshports/$refname $(gi= t merge-base $NAME_OF_REMOTE/$NAME_OF_HEAD $refname) fi # Get the list of commits between the last known one and the tip of # the branch, list may be empty. git rev-list freshports/$refname..$refname | while read commithash do # checkout that commit (with -f so that if some file got changed, we # overwrite everything git checkout -f $commithash # process the commit done # Store the last known commit that we just processed. git tag -m "last known commit of $refname" -f freshports/$refname $refname done ############################# That's all, you never need to merge or pull or whatever else. > >=20 > >> * know which branch each of those commits was on (e.g. master, branche= s/2020Q4) > >=20 > > You will need to keep track of the latest commit on each branch > > separately, because there is absolutely no relation or ordering > > possible between branches. >=20 > Yes, I agree. FreshPorts is keeping track of the last commit on each bran= ch. >=20 > Thank you. --=20 Mathieu Arnold --ntqidtvwvhfysqlt Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEVhwchfRfuV0unqO5KesJApEdfgIFAl+9NcNfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDU2 MUMxQzg1RjQ1RkI5NUQyRTlFQTNCOTI5RUIwOTAyOTExRDdFMDIACgkQKesJApEd fgIejw/+K4i1Xzf+R1pcI4AevRitLSAxmppyYnAiuj8Vn6Ts3vtWam8pzHRJZObd DHFWqmtAbJRvPuPGVhssnW18ueWRCxpU4v/ue4SgWf3I428kaAOTf+Ic0pwhizIS 9SERfpis4Bp8BJLUzyqIMs0MBH1MSINXJREdW/HWDKfmpu/y3p2r4tpRo0Fo9ibW Z5r/eYg+mQC593weEiz27Wd30DGhhwfdPFh72qyuURiYnxnSIFs8VTTty9E0k/WP pfdiXIdyGmoRgTy93Pt0ThoiN/MpRQ250QcBQ3IuQg0z8ze0GLPzss1Hh3ru2+BJ 5Z0SeJMCb7v86QT4mSqVBmJrXAwJT1NmxtmnkWNvZ1OE9/QhjdRKNmNpH7XNbdDv Nq1NDN0RQ59guLayDorKF6Fm5f12eKkBpp7NJxu+/2GTGEEIldThpTSp/bv40LCR TPr3eWJyEOnDfIS6Xsiws7rEc+uP7a5H8rz2p+6tSJOYy608xWI/QohjipSlwrQc Z+TnPu7QVkzsuVI8nd2C2+9nk+FPmo88VIs2P30bp7WX45QAATy5YveV4jCK3J1h l/QEGask5U9KJd/HpQYE5hR64flUAIotC1FLfUjZ+N7zvqMTmZ0IA9yuIsBXQYLN ebxqeBlfEWJS/S3xkTEu3cvCU33vfdKZS1bwbQvY9ahgtVm8EuE= =1D7t -----END PGP SIGNATURE----- --ntqidtvwvhfysqlt-- From owner-freebsd-git@freebsd.org Thu Nov 26 16:39:03 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 904CC46889D for ; Thu, 26 Nov 2020 16:39:03 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-il1-f178.google.com (mail-il1-f178.google.com [209.85.166.178]) (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 4Chk3p6DBVz4hs3 for ; Thu, 26 Nov 2020 16:39:02 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: by mail-il1-f178.google.com with SMTP id y9so2318504ilb.0 for ; Thu, 26 Nov 2020 08:39:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=/RE0ZQFEAwtMCrsBQgySvPxbbmpJqke/uy1DjOwrCbA=; b=ThDSl8ivyeJTWHOMN/sLlJy30WO/v2w+0zDcm44Ad/iTObhE4HGbFnr81fXMNchn+0 WKe1BGizOUt74sCkfiKVRx48xkH8idgzazdr/Sju70AHzjnOzcKKyjcxRoBjojGK8394 SAvTOowLh0xJecQpM1krQjO7J6WK1b27GisAgpQ0mIkn/NG1QEBuR9YWZDCo01JX8igc H5Y6y0PYI3KKmnhy/04sMtG3w8S9nFCwpQASZosZ+JAZHm6GKn8HI+m2+Pos9enJvcvM 3QiRa6RO65seF1IL3IppUWyqwMBw58C6Kycb5tse65P7ykExcxH2GP1uHo4A3LsNSz0p BQYA== X-Gm-Message-State: AOAM533UZhjRBBiLs+f6sjtWpqj84gXfPiwXkqIyKjiXmZEhnRPj4Th7 rvZS/1ad0uKRGRhsmKObLQYHUSEZ+Ta7v773VLH7qIWhVt4= X-Google-Smtp-Source: ABdhPJyyfn0z4eYavyMffT4lNMlo9OYAYsL/dzeeP+18saI/+XePAf1HDFcTf7YL6XmXXqCZd+I2CLAlbY8+hWGN3mE= X-Received: by 2002:a92:cd51:: with SMTP id v17mr3133378ilq.98.1606408740997; Thu, 26 Nov 2020 08:39:00 -0800 (PST) MIME-Version: 1.0 From: Ed Maste Date: Thu, 26 Nov 2020 11:38:49 -0500 Message-ID: Subject: Heads-up: GitHub mirror currently stalled To: freebsd-git Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4Chk3p6DBVz4hs3 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.166.178 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com X-Spamd-Result: default: False [-2.92 / 15.00]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; TO_DN_ALL(0.00)[]; NEURAL_HAM_SHORT(-0.99)[-0.988]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.166.178:from]; R_DKIM_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; TO_DOM_EQ_FROM_DOM(0.00)[]; ARC_NA(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[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.166.178:from:127.0.2.255]; NEURAL_HAM_MEDIUM(-0.93)[-0.929]; RCVD_IN_DNSWL_NONE(0.00)[209.85.166.178:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.166.178:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; 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: Thu, 26 Nov 2020 16:39:03 -0000 Due to an issue with GitHub's CI configuration the svn->git mirror at https://github.com/freebsd/freebsd is currently stalled, and not receiving updates. It should be restored soon. From owner-freebsd-git@freebsd.org Thu Nov 26 19:37:44 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8049546E1EC for ; Thu, 26 Nov 2020 19:37:44 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (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 4Chp1z5bmpz3D0G; Thu, 26 Nov 2020 19:37:43 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-ot1-f43.google.com with SMTP id h39so2732805otb.5; Thu, 26 Nov 2020 11:37:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=F1P6n3byXuep3jviLUZ/i66bQV1zCflmrT0Q3eToxs0=; b=Zbsbpq2XSn+wch+RMA+I648uFPx1YjUzSqe5mDa6Xa/8G5ECDZk28ab8YwU47MJCNc 2TSfhzuljd8twmRDhCd6G7d+7FubAwOf0yMX0LyGZ4b5ppb9hrIXUDQQDavjqAi95ZKl 0bVTWxEZCPky2TbRuu/FjzJ6RY5VF0eNCbfBFagh078gnGOEj09o52YPDw3qx7WcvCUe 4QmXUl78OpT2UMU7w7waJq/dHcijoAf0PdNea+8miZpKVCX1G+k/kAOf4UNWtS2wrfRa R9Zcm2qI/4w/wSZWVw5Cq7a0wziOWTk8pMqCksvrFAXdKB6Q2vaJGEyaazl3qwZ118Ga C5nQ== X-Gm-Message-State: AOAM532+4hGhrpoYP8E7nn45sUxtJTtQtob5wdt4QgkEi6deUjrdKI3c 0k54VOVQ2kHMcwV0eE1lUIIzDXNaY5hAiV6ZJU41dyGu+rk= X-Google-Smtp-Source: ABdhPJwsTHz+brrQTUsNKC3r5YfcAwu6ClcK2mYyS8xjy/SbFNxnjFRdlwSw6Su6q2vqj70W+TUtVVW9P4joNco54/A= X-Received: by 2002:a9d:3636:: with SMTP id w51mr3239136otb.71.1606419462312; Thu, 26 Nov 2020 11:37:42 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Thu, 26 Nov 2020 20:37:31 +0100 Message-ID: Subject: Re: Heads-up: GitHub mirror currently stalled To: freebsd-git X-Rspamd-Queue-Id: 4Chp1z5bmpz3D0G X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.210.43 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-0.47 / 15.00]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2]; ARC_NA(0.00)[]; FROM_HAS_DN(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[209.85.210.43:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.210.43:from]; NEURAL_SPAM_MEDIUM(0.80)[0.798]; SPAMHAUS_ZRD(0.00)[209.85.210.43:from:127.0.2.255]; TO_DN_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[209.85.210.43:from]; NEURAL_HAM_SHORT(-0.82)[-0.822]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; R_DKIM_NA(0.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_MIXED_CHARSET(0.56)[subject]; MIME_TRACE(0.00)[0:+,1:+,2:~]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, 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: Thu, 26 Nov 2020 19:37:44 -0000 On Thu, Nov 26, 2020 at 5:39 PM Ed Maste wrote: > Due to an issue with GitHub's CI configuration the svn->git mirror at > https://github.com/freebsd/freebsd is currently stalled, and not > receiving updates. It should be restored soon. > Pushes to the old github instances have now resumed, the new and soon-to-be official repos at https://cgit-beta.freebsd.org/ were never affected. Cheers Uli From owner-freebsd-git@freebsd.org Fri Nov 27 18:25:13 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DEA744AE163 for ; Fri, 27 Nov 2020 18:25:13 +0000 (UTC) (envelope-from dan@langille.org) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjNMr4v4wz3qxX for ; Fri, 27 Nov 2020 18:25:12 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 1314B5C004F for ; Fri, 27 Nov 2020 13:25:12 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute4.internal (MEProxy); Fri, 27 Nov 2020 13:25:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= from:content-type:content-transfer-encoding:mime-version:subject :message-id:date:to; s=fm2; bh=b9mXzwXCiA5GmSATaOVVzQbCNVYpuLqyF IcUB3NjHZM=; b=NI/FlV40TU/WB6a018rd0DXN7ym+Jrf+O/WXW4pMFLrmDuBB5 v4UjPg8shVZmXVVXI9daDlcF9nRiTLJN5Yp5JpC2yY4IuxzzbUXAmPJL3wOMoYtd 9JL+pVeZqF+UUZyI0J55CfN329lInWPvl1ALa/X6NJltI1c2RhLXFFwSuadrR4bB YVJplBxQUVfkoHcBoBXZmtfmb5dWl9KNmAn4M6EeoRWFxMYTPKjugnJveKSWZ3eo x3y2eUW0OMurUDxQxt8H9Imyl/xmLhO0yrwRnnNLqb9EsoV4UNqlg2/qUVOJnhER ZS+fOfZMFInPGUTZWcti7jqMh94nNoQT3JxjA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding: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=fm1; bh=b9mXzw XCiA5GmSATaOVVzQbCNVYpuLqyFIcUB3NjHZM=; b=Vy8Zz35mgE/7LbxTyuvcOB pQD9KtLmINeRcT2mrMMxG2ybpyOjbzBaxZM/7Ag+rHbkEPWnNtgm72oV6/HSxNVT zt49Yj1vJYr8Vb2JG8wxZVWMISDDwoN3h3MepgD/mc6m3+4J+26Nen9GLVEfWLEs vJOAfzZCQhhs09hXwiHZOMkFDyfGHwyh0GrZVLz3Uckgtnicw1fH+wXKac18FRJV YEWFFSAhsNcCdNaNG9NfVblfDJCDlyNtJgRdG3nE72b4vfPcVwYPaWYwmgMA5MHW ZxHm22c/jAOQ7EEH7WqDnB0Ob6/PUjpT7sOts/LlirY9m6iEoLvKGi+sAQyF0d7Q == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudehgedguddufecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephfgtgfgguffkfffvofesthhqmh dthhdtvdenucfhrhhomhepffgrnhcunfgrnhhgihhllhgvuceouggrnheslhgrnhhgihhl lhgvrdhorhhgqeenucggtffrrghtthgvrhhnpeduuedvteevffetveegtedtgfejhfekgf ehheegteejtdeludejhfelkefgtdejleenucffohhmrghinhepfhhrvggvsghsugdrohhr ghdpghhithhhuhgsrdgtohhmnecukfhppeejvddrjeekrdduledtrdduledtnecuvehluh hsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepuggrnheslhgrnhhg ihhllhgvrdhorhhg X-ME-Proxy: Received: from [10.222.78.31] (pool-72-78-190-190.phlapa.fios.verizon.net [72.78.190.190]) by mail.messagingengine.com (Postfix) with ESMTPA id 899BD3064AA6 for ; Fri, 27 Nov 2020 13:25:11 -0500 (EST) From: Dan Langille Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Mime-Version: 1.0 (Mac OS X Mail 13.4 \(3608.120.23.2.4\)) Subject: git vs svn for vendor/bc/dist Message-Id: Date: Fri, 27 Nov 2020 13:25:11 -0500 To: freebsd-git@freebsd.org X-Mailer: Apple Mail (2.3608.120.23.2.4) X-Rspamd-Queue-Id: 4CjNMr4v4wz3qxX X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=NI/FlV40; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=Vy8Zz35m; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.28 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.60 / 15.00]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.28:from]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.28]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RECEIVED_SPAMHAUS_PBL(0.00)[72.78.190.190:received]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.28:from]; RCVD_TLS_LAST(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[66.111.4.28:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.28:from]; 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: Fri, 27 Nov 2020 18:25:13 -0000 I am trying to understand how git handled this subversion commit: https://svnweb.freebsd.org/base?view=3Drevision&revision=3D368062 The file paths are vendor/bc/dist/.gitignore etc. On git, we have = https://github.com/freebsd/freebsd/commit/982c17586e39a3d0655b62da43a5642b= 69ab2af0 It looks to be the same list of files, but without the vendor/bc/dist/ = prefix. The files all seems to be in the base directory. Can anyone explain this for me please? Should they not have the same = path? --=20 Dan Langille - BSDCan / PGCon dan@langille.org From owner-freebsd-git@freebsd.org Fri Nov 27 18:57:51 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D32B4AEA95 for ; Fri, 27 Nov 2020 18:57:51 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qv1-xf2c.google.com (mail-qv1-xf2c.google.com [IPv6:2607:f8b0:4864:20::f2c]) (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 4CjP5V3RMjz3sjR for ; Fri, 27 Nov 2020 18:57:50 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qv1-xf2c.google.com with SMTP id q7so2729232qvt.12 for ; Fri, 27 Nov 2020 10:57:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=3OTJkFGsHq6XWolA3Jds/WFOBSAat47zQNL09fTmHts=; b=wfFbhgg2bcu0r9E/Uw50rJ2mNPn31L/uLPS+5indc7XtSaxoA5EtQRAdMtUyC0JdGr RTzi5TkmOLiGXPfVKxYAlWiQVjyrt5+qRtkXOgZx4hkpdquyacy6dUIgStdfxNV7MFPF hlY2LWRlI9CWPHX019sVZWVzxwyxASK8Da2FjdTyuNiDqCHnkvruZ4+eHBKLQ3kpk3vE IkYe5Uv/DKYvphJ7DAN+aYyLGh1F9UJsEesaElpcNNnO4UTX1yXL7jPXsNkCZ1zWRtgx Uwj35qiV8TJJQ+/gJ9/pEvtGtKAlPPjlDnr70nk4RWK8Gpf94SkpmfBQglZcf68YqvNM 0CCw== 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=3OTJkFGsHq6XWolA3Jds/WFOBSAat47zQNL09fTmHts=; b=XzjdNrS8d44GE3wD3qbXACTjn8hJem7IkzmUTL3/q6k/1qHFPQ+NO+fZzBonhgQ47k /h1lG2EdZCyMN04tUEw+ZJQa5CKGO6U5/4M/VoJwRPt1kVm667JkhDXNP8ZrqT52UvGy QdCGeeXyqDTyjNAt46+skp90C6MxurGo3zQEBGMWeLpH0DOeDSc+b/teV9+IIFLPc/ze madUsyjh/WgaxoryUBWIF5/nIsBRMFVKJzcfsoPHiue+cqdmyS53q3YGckHe4rkcFqbR lwzPXQxGtlqIu3OThsbxomLBGelAiXKyNk8aKrp6c9Blo4gKpOAMbn7s17Klu7pakmTw blkQ== X-Gm-Message-State: AOAM532V5oU0JnAoLOeWJvPvXkdpeXobE0F9Z5P6NGQSTsPn8ttbhUvo 65qGe51W2eP3tNZlXcHF8t1fYBtLzuKvnUodlTrw/9nrNzui8Q== X-Google-Smtp-Source: ABdhPJxTq87HBDVVNBeWlnAFyPjSztz7wIiEb8lAgPnyzI4giSiVnHHG2UVO2jiDXZmde3TZurzeIfsCUfzU7WnlSjI= X-Received: by 2002:ad4:4e13:: with SMTP id dl19mr9602374qvb.24.1606503469411; Fri, 27 Nov 2020 10:57:49 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Warner Losh Date: Fri, 27 Nov 2020 11:57:38 -0700 Message-ID: Subject: Re: git vs svn for vendor/bc/dist To: Dan Langille Cc: freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4CjP5V3RMjz3sjR X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=wfFbhgg2; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::f2c) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(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::f2c:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; RCPT_COUNT_TWO(0.00)[2]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::f2c: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::f2c:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] 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: Fri, 27 Nov 2020 18:57:51 -0000 Hey Dan, On Fri, Nov 27, 2020 at 11:25 AM Dan Langille wrote: > I am trying to understand how git handled this subversion commit: > > https://svnweb.freebsd.org/base?view=revision&revision=368062 > > The file paths are vendor/bc/dist/.gitignore etc. > > On git, we have > https://github.com/freebsd/freebsd/commit/982c17586e39a3d0655b62da43a5642b69ab2af0 > > It looks to be the same list of files, but without the vendor/bc/dist/ > prefix. > > The files all seems to be in the base directory. > > Can anyone explain this for me please? Should they not have the same path? > git and svn are different in how they handle labeling interesting bits of the tree. subversion has one large tree as its name space. So all tags and branches are done in the context of that tree via copy commands. Creation / changing of tags also consumes a subversion revision. git has two name spaces, though. One for tall the files, and a separate one for tags and branches. Tags and branches are not versioned in git, so they don't create a new hash. The upshot of all this is that the vendor branch in git looks somewhat different than a vendor branch in subversion, and this is what you are seeing. After the holiday weekend, I should have the 'how to do vendor branches in git' written up and, if I did my job right, it should become more clear. Warner From owner-freebsd-git@freebsd.org Fri Nov 27 19:03:37 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5D2754AEB1D for ; Fri, 27 Nov 2020 19:03:37 +0000 (UTC) (envelope-from dan@langille.org) Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjPD82X70z3skx for ; Fri, 27 Nov 2020 19:03:35 +0000 (UTC) (envelope-from dan@langille.org) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id AEBA85C0134; Fri, 27 Nov 2020 14:03:35 -0500 (EST) Received: from imap36 ([10.202.2.86]) by compute4.internal (MEProxy); Fri, 27 Nov 2020 14:03:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=langille.org; h= mime-version:message-id:in-reply-to:references:date:from:to:cc :subject:content-type; s=fm2; bh=zDyE/MOthYWUFq/lOVO8xfvm3BPYuqT LMIheAL2+5cs=; b=gqmW+HFW0z058A/w2q2WpoQZWgB2q91wxF+54zp328MAX4M miifOKdkDDtzlmBZQq+DXVhpAAPZM7cQJt2BrpiTKJ2625OQMIKnijAjG35ilATy Gqxg/LXU3quDiiUIW62d3nE+VAEdtFsStFLMRwae1rFw25FV73bYOKKliOtn0aOr DNdYbh3jnorprk8qBMyMj53eZqEIdEJED2oCJzWI4OYp55+5spp0h7iI5LAMkPKt V1JaPL6t9469yHO4loL6TeS/SB99D1TOD+RrhuukExZmKu9HegY2+xZqRTGqDiaN URKmaZ9Z1qFJIa29xqNTaWd9XsQcVRS6NL6xmTg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc: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=fm1; bh=zDyE/M OthYWUFq/lOVO8xfvm3BPYuqTLMIheAL2+5cs=; b=hxYkvtt2rtuZ/wdKpBMq3g 3VopWsbt0K79T/QPqHNbUpwGL5bSSkdmwSvBs4rd8H5fHRbPesj0UiIfX+LfmRzH JQ3ZFThgX01FjermHLuxRHiDvc1NIbQQYFk58HZAPGpa+58iulGWC03wUMeF9FwR L8ftGiK2sMllBy1DivOT5D2jPTuqjvNz0JWx7LJMp2J0XQkP59JFHaPXz+G2i5ta Y2tfIIe2l02XgpNyJsJS5RuS2vX1H+VUxtdomOyCqxEDhq1eFBtQaoajjvh9TXwC bvrkcbl54Kuh33DSpueMyiHcaybXXa9I4zpiPMhQsIICKJw4e2B11SlkIwdAzOZA == X-ME-Sender: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedujedrudehgedguddvudcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhepofgfggfkjghffffhvffutgesrg dtreerreertdenucfhrhhomhepfdffrghnucfnrghnghhilhhlvgdfuceouggrnheslhgr nhhgihhllhgvrdhorhhgqeenucggtffrrghtthgvrhhnpeekfeeufeeihefgfedvudejhf ehffdvtefhudegfeegveffgfevtddvhfejlefftdenucffohhmrghinhepfhhrvggvsghs ugdrohhrghdpghhithhhuhgsrdgtohhmnecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepuggrnheslhgrnhhgihhllhgvrdhorhhg X-ME-Proxy: Received: by mailuser.nyi.internal (Postfix, from userid 501) id 07DE4188007B; Fri, 27 Nov 2020 14:03:34 -0500 (EST) X-Mailer: MessagingEngine.com Webmail Interface User-Agent: Cyrus-JMAP/3.3.0-622-g4a97c0b-fm-20201115.001-g4a97c0b3 Mime-Version: 1.0 Message-Id: In-Reply-To: References: Date: Fri, 27 Nov 2020 14:03:14 -0500 From: "Dan Langille" To: "Warner Losh" Cc: freebsd-git@freebsd.org Subject: Re: git vs svn for vendor/bc/dist X-Rspamd-Queue-Id: 4CjPD82X70z3skx X-Spamd-Bar: --- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=langille.org header.s=fm2 header.b=gqmW+HFW; dkim=pass header.d=messagingengine.com header.s=fm1 header.b=hxYkvtt2; dmarc=pass (policy=none) header.from=langille.org; spf=pass (mx1.freebsd.org: domain of dan@langille.org designates 66.111.4.28 as permitted sender) smtp.mailfrom=dan@langille.org X-Spamd-Result: default: False [-3.04 / 15.00]; XM_UA_NO_VERSION(0.01)[]; TO_DN_SOME(0.00)[]; MV_CASE(0.50)[]; R_SPF_ALLOW(-0.20)[+ip4:66.111.4.28]; RWL_MAILSPIKE_GOOD(0.00)[66.111.4.28:from]; RCVD_COUNT_THREE(0.00)[4]; DKIM_TRACE(0.00)[langille.org:+,messagingengine.com:+]; RCPT_COUNT_TWO(0.00)[2]; DMARC_POLICY_ALLOW(-0.50)[langille.org,none]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_LOW(-0.10)[66.111.4.28:from]; RCVD_TLS_LAST(0.00)[]; RBL_DBL_DONT_QUERY_IPS(0.00)[66.111.4.28:from]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; ASN(0.00)[asn:11403, ipnet:66.111.4.0/24, country:US]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; R_DKIM_ALLOW(-0.20)[langille.org:s=fm2,messagingengine.com:s=fm1]; FREEFALL_USER(0.00)[dan]; FROM_HAS_DN(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; SPAMHAUS_ZRD(0.00)[66.111.4.28:from:127.0.2.255]; MANY_INVISIBLE_PARTS(0.05)[1]; TO_MATCH_ENVRCPT_SOME(0.00)[]; MID_RHS_WWW(0.50)[]; MAILMAN_DEST(0.00)[freebsd-git] Content-Type: text/plain 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: Fri, 27 Nov 2020 19:03:37 -0000 On Fri, Nov 27, 2020, at 1:57 PM, Warner Losh wrote: > Hey Dan, > > On Fri, Nov 27, 2020 at 11:25 AM Dan Langille wrote: >> I am trying to understand how git handled this subversion commit: >> >> https://svnweb.freebsd.org/base?view=revision&revision=368062 >> >> The file paths are vendor/bc/dist/.gitignore etc. >> >> On git, we have https://github.com/freebsd/freebsd/commit/982c17586e39a3d0655b62da43a5642b69ab2af0 >> >> It looks to be the same list of files, but without the vendor/bc/dist/ prefix. >> >> The files all seems to be in the base directory. >> >> Can anyone explain this for me please? Should they not have the same path? > > git and svn are different in how they handle labeling interesting bits of the tree. > > subversion has one large tree as its name space. So all tags and branches are done in the context of that tree via copy commands. Creation / changing of tags also consumes a subversion revision. > > git has two name spaces, though. One for tall the files, and a separate one for tags and branches. Tags and branches are not versioned in git, so they don't create a new hash. > > The upshot of all this is that the vendor branch in git looks somewhat different than a vendor branch in subversion, and this is what you are seeing. > > After the holiday weekend, I should have the 'how to do vendor branches in git' written up and, if I did my job right, it should become more clear. >From a FreshPorts point of view, I need to be able to tell where the files are located. My usual git queries gave the 'wrong' answers. -- Dan Langille dan@langille.org From owner-freebsd-git@freebsd.org Sat Nov 28 11:13:02 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7F4E147D721 for ; Sat, 28 Nov 2020 11:13:02 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjpkk0hcSz3jtN for ; Sat, 28 Nov 2020 11:13:01 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0ASBCnkw010239 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 28 Nov 2020 12:12:51 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 28 Nov 2020 12:12:49 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Dan Langille Cc: Warner Losh , freebsd-git@freebsd.org Subject: Re: git vs svn for vendor/bc/dist Message-ID: References: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cjpkk0hcSz3jtN 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:39540, ipnet:2a05:fc87::/32, country:CH] 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, 28 Nov 2020 11:13:02 -0000 On Fri, 2020-11-27 at 14:03:14 -0500, Dan Langille wrote: >On Fri, Nov 27, 2020, at 1:57 PM, Warner Losh wrote: >> Hey Dan, >> >> On Fri, Nov 27, 2020 at 11:25 AM Dan Langille wrote: >>> I am trying to understand how git handled this subversion commit: >>> >>> https://svnweb.freebsd.org/base?view=revision&revision=368062 >>> >>> The file paths are vendor/bc/dist/.gitignore etc. >>> >>> On git, we have https://github.com/freebsd/freebsd/commit/982c17586e39a3d0655b62da43a5642b69ab2af0 >>> >>> It looks to be the same list of files, but without the vendor/bc/dist/ prefix. >>> >>> The files all seems to be in the base directory. >>> >>> Can anyone explain this for me please? Should they not have the same path? >> >> git and svn are different in how they handle labeling interesting bits of the tree. >> >> subversion has one large tree as its name space. So all tags and branches are done in the context of that tree via copy commands. Creation / changing of tags also consumes a subversion revision. >> >> git has two name spaces, though. One for tall the files, and a separate one for tags and branches. Tags and branches are not versioned in git, so they don't create a new hash. >> >> The upshot of all this is that the vendor branch in git looks somewhat different than a vendor branch in subversion, and this is what you are seeing. >> >> After the holiday weekend, I should have the 'how to do vendor branches in git' written up and, if I did my job right, it should become more clear. > >From a FreshPorts point of view, I need to be able to tell where the files are located. > >My usual git queries gave the 'wrong' answers. The files are located in the vendor/bc/dist branch, and they just sit there at the "top-level", if you will. This is similar to the CVS days basically, it's only SVN that is "weird" in this regard. The prefixes were undone with the "flattening the vendor area" commits post SVN conversion, and I wonder whether we need to bring back the contrib/foo prefixes for all the vendors, to de-confuse git's merging. Warner and Ed should know better if that would help. hth Uli From owner-freebsd-git@freebsd.org Sat Nov 28 11:24:42 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CE18547D8C3 for ; Sat, 28 Nov 2020 11:24:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjq0B4SZfz3kYp for ; Sat, 28 Nov 2020 11:24:42 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0ASBOfKd010997 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sat, 28 Nov 2020 12:24:41 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 28 Nov 2020 12:24:41 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: freebsd-git@freebsd.org Subject: HEADS UP: freebsd-ports hashes were all changed Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cjq0B4SZfz3kYp 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:39540, ipnet:2a05:fc87::/32, country:CH] 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, 28 Nov 2020 11:24:42 -0000 Hi folks, bad news While carving out the history of the access and mentors file (we want to retain that for historical analysis, which people seem to do from time to time), I overlooked that fact that the previous runs for ports did contain all of CVSROOT, but the new one, by necessity would not contain CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix from the latest rules file. It should never have been there in the first place. :( All that is to say that this of course means all the git commit hashes for the ports tree have changed. Oops. Sorry about that, please let me know if you need help in transplanting your work from old hashes to new hashes. Cheers Uli From owner-freebsd-git@freebsd.org Sat Nov 28 11:38:54 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AC99C47DF0B for ; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CjqJZ4Jrnz3kdn for ; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 9211A47DE0A; Sat, 28 Nov 2020 11:38:54 +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 90AC847DD52 for ; Sat, 28 Nov 2020 11:38:54 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjqJZ3VSBz3kxn for ; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EiE05IsAJ+tyM+mqdPq3Q8MEmg+3aDY031SqsBKlG70=; b=LDQFT3dEbYUSG16eKEoGuWU6z9UPqcrzbnLSP1ZbLGsSneyAqjFDO96Y0D/BnLPViASg+c jnOPyqdPVUdOvQXY8al3Z19SW6HzJJv6qYaZJJUsH/+8ou1Xz7Q/LD1rehTsKmMLBzSA2U z9T3oAhuE2nTgANZWwG83eYjGc/lsgSA4re44dOq/fyWmEaXdxHUJ+F/Y+uIdMB7vjNU72 RU7AHDCC5y7ybpulufod2cunLs66I6DVdN63g3njolAIIT5SFoobyM3VQpFKT8LdA9cfvf BYDSvI0rtPrT1CqKa/8c/ekjxE8ntdzogCXAIeYDaXWn4fbKudOxVlDsjej6DQ== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 68DBF189F2; Sat, 28 Nov 2020 11:38:54 +0000 (UTC) Date: Sat, 28 Nov 2020 11:38:54 +0000 From: Rene Ladan To: git@freebsd.org Subject: cgit-beta ports repository diverged? Message-ID: <20201128113854.GA12390@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563534; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EiE05IsAJ+tyM+mqdPq3Q8MEmg+3aDY031SqsBKlG70=; b=XO/1x4lak8WUIot4zJDGnDbz2myqnntKc+B8zHxVV2yldqEgjjeiVJBSP3dmuxwRC90BqC U/F3ElUDWqDkqCWeDBJN/EC4ZKa4dcIcGrbLgwALptqrZMx2Suf4l9eudwNH7ec9MMxGGm EZSW5c9ruZvFVtfwHigqHhe+4N0oLy1zTV4tHWmnii+opQjz/EvB27zA22fVQdPOXJoiZj mdQB4R1yQ+8kGVbUycRsW1E9qGWVdcx9awIWppyl10hrGDaDEHO5+x/T3KIp6hVAMqyyLY xPuTHOlzIJ5hrGY9USHgxkBPru3KPJk/K2Fw7JGKIMm+bUmkVftf5XGpO70V1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606563534; a=rsa-sha256; cv=none; b=yrDD0ERuWRCRnrHUPeN0V2+Byao6IMTZrMutG1exlyUwVtyvn0bmGvRpfNE/6gcKsWw6bg Gh/xPgrruyxophNPH+jTLgBLwUOm3bk/qyh4DpoLtf5TokcNBN2l+njCmqxB57nSfno93p mxyUCqPEfQsc++NhkJyV+iP8sz51R8O56n1sSTqagvwSbfpD+B6J8+ihtl/lQPzqI+K4AV zc36p0eYuC6j0Pbst4pHprz7xiK7zADTyxVS57v9Grm8gWVi4Yya63+5QvKVkz85RnHune ersD+buZqvd7pb9SvLpVcxFzlE+5B6I4b5SbqG+MFhMSMLE8CL1lGZik4PG9jg== 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, 28 Nov 2020 11:38:54 -0000 Hello, I just noticed that after doing a 'git pull' that the ports repository at cgit-beta seems to have diverged: rene@e17:/usr/freebsd/cgit-beta/ports % git status On branch main Your branch and 'origin/main' have diverged, and have 546213 and 528036 different commits each, respectively. (use "git pull" to merge the remote branch into yours) It took 5.85 seconds to compute the branch ahead/behind values. You can use '--no-ahead-behind' to avoid this. nothing to commit, working tree clean rene@e17:/usr/freebsd/cgit-beta/ports % git fetch rene@e17:/usr/freebsd/cgit-beta/ports % git pull fatal: refusing to merge unrelated histories rene@e17:/usr/freebsd/cgit-beta/ports % and what happened to those 18000 commits? René From owner-freebsd-git@freebsd.org Sat Nov 28 11:44:55 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9277447E0E7 for ; Sat, 28 Nov 2020 11:44:55 +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 4CjqRW3g96z3lCc for ; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: by mailman.nyi.freebsd.org (Postfix) id 7DC2E47DFAE; Sat, 28 Nov 2020 11:44:55 +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 7D8D947E0E6 for ; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjqRW35Jxz3l9P; Sat, 28 Nov 2020 11:44:55 +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 "Let's Encrypt Authority X3" (verified OK)) (Authenticated sender: dim) by smtp.freebsd.org (Postfix) with ESMTPSA id 433277869; Sat, 28 Nov 2020 11:44:55 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from [IPv6:2001:470:7a58::f905:f952:d44c:7855] (unknown [IPv6:2001:470:7a58:0:f905:f952:d44c:7855]) (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 DD7B848373; Sat, 28 Nov 2020 12:44:53 +0100 (CET) From: Dimitry Andric Message-Id: <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> Content-Type: multipart/signed; boundary="Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42"; protocol="application/pgp-signature"; micalg=pgp-sha1 Mime-Version: 1.0 (Mac OS X Mail 12.4 \(3445.104.17\)) Subject: Re: cgit-beta ports repository diverged? Date: Sat, 28 Nov 2020 12:44:49 +0100 In-Reply-To: <20201128113854.GA12390@freefall.freebsd.org> Cc: git@freebsd.org To: Rene Ladan References: <20201128113854.GA12390@freefall.freebsd.org> X-Mailer: Apple Mail (2.3445.104.17) 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, 28 Nov 2020 11:44:55 -0000 --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii On 28 Nov 2020, at 12:38, Rene Ladan wrote: > > I just noticed that after doing a 'git pull' that the ports repository > at cgit-beta seems to have diverged: > > rene@e17:/usr/freebsd/cgit-beta/ports % git status > On branch main > Your branch and 'origin/main' have diverged, > and have 546213 and 528036 different commits each, respectively. > (use "git pull" to merge the remote branch into yours) > > It took 5.85 seconds to compute the branch ahead/behind values. > You can use '--no-ahead-behind' to avoid this. > > nothing to commit, working tree clean > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > fatal: refusing to merge unrelated histories > rene@e17:/usr/freebsd/cgit-beta/ports % > > and what happened to those 18000 commits? I think you just missed Ulrich's heads-up mail :-) https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html -Dimitry --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42 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 iF0EARECAB0WIQR6tGLSzjX8bUI5T82wXqMKLiCWowUCX8I4MQAKCRCwXqMKLiCW ozMDAJ49+xbIGbST+Bf7o7qghMmrVcJN+QCg0Ua8JqDwIvvM3iPv9IZYdreVMOQ= =X3xA -----END PGP SIGNATURE----- --Apple-Mail=_46B02821-0368-4A99-AC86-58D7E7FEEE42-- From owner-freebsd-git@freebsd.org Sat Nov 28 11:46:37 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 12DF947E1C4 for ; Sat, 28 Nov 2020 11:46:37 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4CjqTS6v3sz3lJm for ; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id ECA0B47DFE4; Sat, 28 Nov 2020 11:46:36 +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 EC66E47E1C3 for ; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjqTS6N7kz3ktp for ; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pvIoUmRwPNKgn6VAH//L/RIbSHRRSIb7VjDcTdwC3fA=; b=ocl8h9NajN2w9RYL/b+P+8udPyENNDYxGlPoUmvH97gbmSgKOSv0Zxb0vOCo/uNgBtBT3E yLrRixU1RInMlhnKlNGahJqev9zrLp3wG/BV3kvRtHva8KEc0f7uIXFPVjMGkcXaR9rt5y dy6awrIIl+W9E+oDmZwKYZqQJsGKyHrrL8Ekoe7R+7G91ZLSPJdDiGdf0GA8admZxug4Vw dkRI464y6rp/p3mzgTyU0hyF4ZoG1rg6lPE9CpDGcPy7QqXccYK1Sj+FRbKb0RfUPTowcn Vlq442CUoSIG4y4X4d98T8MJGk50VO6M1cTUnKEIXNobrPHbAaEDNj7oCNgPXg== Received: by freefall.freebsd.org (Postfix, from userid 1185) id C27EF18D24; Sat, 28 Nov 2020 11:46:36 +0000 (UTC) Date: Sat, 28 Nov 2020 11:46:36 +0000 From: Rene Ladan To: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128114636.GA24238@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20201128113854.GA12390@freefall.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606563996; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=pvIoUmRwPNKgn6VAH//L/RIbSHRRSIb7VjDcTdwC3fA=; b=LthIy3X8BcMo+uogTi+4HuTJugx4BQP6F27uyOs4eF2GJz9r3BBKBsE0UYziES///MjJAL yKuwjS49cmUDZupykXEgoI8f4g3DVov0krltZrxLCztmq6kVsZrLEuj+TIXBT0fwhgDRtA i2YeSkluyXylsYZfwWUd5l4fAL/l11SfuYteY/06M2ZPtbwGFh+lWfzZ1zJSnCzuuvZTZZ xOO8ZAzFKsxs4uarhkU7Jo8Zr3nKSHy5Yxawaxrc/rs6Hsv4iCsfXyxMIvr8RDpHKlbTdc vDhZT45gRRySV+12RaGNLUNXoddzehuc6IPk46vDq8X9GIRY79O9eZgdW4YQ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606563996; a=rsa-sha256; cv=none; b=vR2NiDYWfi/w4QH+RG1C+H615nwz3twP7mmKNvS0W6+QhykhkV9jvqZ5ShO+FtJVR24O+j vmZu2DHTbnqslBPlEuV1pqPQmAel8gdX/rbMsOohnzprpUqe1CHvOYoeANxq/A39TUgsIl uzP0P0LzZWSsGm+6CpVp8H96GLgb6bCk5HDF/2TuekejYwUinIctDzR6qdexbS7jSVFCNY p3vUg1Yckys76v6wIX803o/yps6kt1SJsEAbJqT/xdBMzm+ADh5+sD+QcwL9c2UzXyNmnz bERvNXtxt/vL52KK+Up1OHSxu3AfRPPRYKhjWfjl4O/jgpfkZSjyrZuOQ/2SBQ== 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, 28 Nov 2020 11:46:37 -0000 See uqs' mail... On Sat, Nov 28, 2020 at 11:38:54AM +0000, Rene Ladan wrote: > Hello, > > I just noticed that after doing a 'git pull' that the ports repository > at cgit-beta seems to have diverged: > > rene@e17:/usr/freebsd/cgit-beta/ports % git status > On branch main > Your branch and 'origin/main' have diverged, > and have 546213 and 528036 different commits each, respectively. > (use "git pull" to merge the remote branch into yours) > > It took 5.85 seconds to compute the branch ahead/behind values. > You can use '--no-ahead-behind' to avoid this. > > nothing to commit, working tree clean > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > fatal: refusing to merge unrelated histories > rene@e17:/usr/freebsd/cgit-beta/ports % > > and what happened to those 18000 commits? > > René > _______________________________________________ > 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 Nov 28 11:52:02 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BA64E47E274 for ; Sat, 28 Nov 2020 11:52:02 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjqbk3scGz3lcP for ; Sat, 28 Nov 2020 11:52:02 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0ASBq1hx012778 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO) for ; Sat, 28 Nov 2020 12:52:01 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 28 Nov 2020 12:52:01 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed 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.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cjqbk3scGz3lcP X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [0.00 / 15.00]; ASN(0.00)[asn:39540, ipnet:2a05:fc87::/32, country:CH]; local_wl_from(0.00)[freebsd.org] 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, 28 Nov 2020 11:52:02 -0000 On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote: >Hi folks, bad news > >While carving out the history of the access and mentors file (we want to >retain that for historical analysis, which people seem to do from time >to time), I overlooked that fact that the previous runs for ports did >contain all of CVSROOT, but the new one, by necessity would not contain >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix >from the latest rules file. It should never have been there in the first >place. :( > >All that is to say that this of course means all the git commit hashes >for the ports tree have changed. Oops. > >Sorry about that, please let me know if you need help in transplanting >your work from old hashes to new hashes. I should add the crucial detail that this affects ONLY - cgit-beta.freebsd.org - cgit-dev.freebsd.org and it does NOT affect: - github.com/freebsd/freebsd-ports - git-beta.freebsd.org/freebsd-ports Sorry that I wasn't clear in the initial email. Cheers Uli From owner-freebsd-git@freebsd.org Sat Nov 28 13:40:45 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 822B34A1B81 for ; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cjt192tg1z3qxw for ; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 615C14A1A86; Sat, 28 Nov 2020 13:40:45 +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 612174A14F1 for ; Sat, 28 Nov 2020 13:40:45 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjt192Nx4z3r50; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606570845; 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=OPcjUbA2ZG18ZcTTuuwDGmewytjTebGr5Rp4nCUcZ5M=; b=jUHc9945JAfVqmllAdpDiQqdzU88U8TN5oJKEJmokKmAanLEHc46EPo5ISuiyhD2RnOre6 Hwc4hzHHPZirs5zt2NSvaliTB15k5txHjSUr/Gj2LJd/vG+J8VwKWAUNOXT4Xs1Cw8+0v1 6Xvx/6/khxtYrq3dlqht8cjB+WHG3NYF4I7IoHNiCkxFV1bkYmd1hBjnB+BnBQDg28Lku7 fwPzWmA8dF5CR5qTKg/a8fYdXelAaOb0ivJ3kRuWF2rBrMitrhV7sgPNgYhOyXA/cR77Nz qj4OVeq2CoAffjAkL6JcZsUSitVMF4054p5FNLS6y0QjV4IWhAaJiofr0dS8FA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 48710195F2; Sat, 28 Nov 2020 13:40:45 +0000 (UTC) Date: Sat, 28 Nov 2020 13:40:45 +0000 From: Rene Ladan To: Dimitry Andric Cc: git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128134045.GA35756@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606570845; 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=OPcjUbA2ZG18ZcTTuuwDGmewytjTebGr5Rp4nCUcZ5M=; b=LXdyb4/CgtpZnbY/pSFgBFphaYN6+S+jkQ1P+kLIwvU1qc/UaPL6+ktGEGmrjcFiW64SvH qvuNrLoxfpvl+qLiQh+ya/rO2uqIv6y5IDsXSglmAmM2UOuD6aAj11w8JPR50tM3hz+1zj 6w9uIKY5KA3JuaZe+d5qEBIFqIv/s3W2lsxItT8F08cwoPQAbLHIy6OvTzzLLRKS5QJa+f KgWFcnbPhABFB1kAkK+xrTnDfRayLKOEQQTGBAiUh0QkpFqewKLiJDoFBMxaFRu1PUfA8L 5oXOvJ7NzQgwLuYKOG5790svI9Ci+vdylso8OzOUL7a8Z9WDzHlTcfnKc58NQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606570845; a=rsa-sha256; cv=none; b=qPXMiLxsn9TXVQvboobvJWjLjGN5unTEbS6oq2I0lt7b6o/AVm6hEHbat2xC+wv2ItHbpj lJzk5M6sjytL7ZV/716PBnvVCI2fRKgM5bnApyRkzzrAtPJL97m5it7Tm7DriQiasVsaUB kwCGPnq+caEDhb7llRlWzcACN47ZBV9aJi4Axn/TuQpFqJLy02I0kDkQJBP8DRVm3h8nTC uFH1/5BxdfJf7Jwa7hwZZ1j/oRcsfIpn93Eb/rFgoq4upg35ZBK5dP/YF3Gi5NVJsyqY4Z JlvcQjiYy8YCwCxTy1NW+4H3rBUCA/9OZgbenkCcar9GIDvESf5M5BZJmC2VFA== 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, 28 Nov 2020 13:40:45 -0000 On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote: > On 28 Nov 2020, at 12:38, Rene Ladan wrote: > > > > I just noticed that after doing a 'git pull' that the ports repository > > at cgit-beta seems to have diverged: > > > > rene@e17:/usr/freebsd/cgit-beta/ports % git status > > On branch main > > Your branch and 'origin/main' have diverged, > > and have 546213 and 528036 different commits each, respectively. > > (use "git pull" to merge the remote branch into yours) > > > > It took 5.85 seconds to compute the branch ahead/behind values. > > You can use '--no-ahead-behind' to avoid this. > > > > nothing to commit, working tree clean > > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch > > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > > fatal: refusing to merge unrelated histories > > rene@e17:/usr/freebsd/cgit-beta/ports % > > > > and what happened to those 18000 commits? > > I think you just missed Ulrich's heads-up mail :-) > > https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html > Yes, I was a bit too fast noticing myself ;) René From owner-freebsd-git@freebsd.org Sat Nov 28 14:07:19 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 618734A1AED for ; Sat, 28 Nov 2020 14:07:19 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from mailman.nyi.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 4Cjtbq2JXWz3sJj for ; Sat, 28 Nov 2020 14:07:19 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 4D69D4A1F54; Sat, 28 Nov 2020 14:07:19 +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 4D2454A2139 for ; Sat, 28 Nov 2020 14:07:19 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from acme.spoerlein.net (acme.spoerlein.net [IPv6:2a05:fc87:1:5::15]) (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 (2048 bits) client-digest SHA256) (Client CN "www.spoerlein.net", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjtbq0b9Tz3s7q; Sat, 28 Nov 2020 14:07:15 +0000 (UTC) (envelope-from uqs@freebsd.org) Received: from localhost (acme.spoerlein.net [IPv6:2a05:fc87:1:5:0:0:0:15]) by acme.spoerlein.net (8.16.1/8.15.2) with ESMTPS id 0ASE7EXG021398 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 28 Nov 2020 15:07:14 +0100 (CET) (envelope-from uqs@freebsd.org) Date: Sat, 28 Nov 2020 15:07:14 +0100 From: Ulrich =?utf-8?B?U3DDtnJsZWlu?= To: Rene Ladan Cc: Dimitry Andric , git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> <20201128134045.GA35756@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: <20201128134045.GA35756@freefall.freebsd.org> User-Agent: Mutt/2.0.1 (2020-11-14) X-Rspamd-Queue-Id: 4Cjtbq0b9Tz3s7q 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, 28 Nov 2020 14:07:19 -0000 On Sat, 2020-11-28 at 13:40:45 +0000, Rene Ladan wrote: >On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote: >> On 28 Nov 2020, at 12:38, Rene Ladan wrote: >> > >> > I just noticed that after doing a 'git pull' that the ports repository >> > at cgit-beta seems to have diverged: >> > >> > rene@e17:/usr/freebsd/cgit-beta/ports % git status >> > On branch main >> > Your branch and 'origin/main' have diverged, >> > and have 546213 and 528036 different commits each, respectively. >> > (use "git pull" to merge the remote branch into yours) >> > >> > It took 5.85 seconds to compute the branch ahead/behind values. >> > You can use '--no-ahead-behind' to avoid this. >> > >> > nothing to commit, working tree clean >> > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch >> > rene@e17:/usr/freebsd/cgit-beta/ports % git pull >> > fatal: refusing to merge unrelated histories >> > rene@e17:/usr/freebsd/cgit-beta/ports % >> > >> > and what happened to those 18000 commits? >> >> I think you just missed Ulrich's heads-up mail :-) >> >> https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html >> >Yes, I was a bit too fast noticing myself ;) Yeah, sorry about that. I typically test new rulesets on my own machine and compare the results first, somehow I only did this for src when I did the history for the `access` file and for ports it lives not under svnadmin but under head/CVSROOT and I somehow didn't test that, wanting to get the change out and over with. With the right git incantation you should be able to rebase your work on the new upstream master just fine. Sorry for the inconvenience, Uli From owner-freebsd-git@freebsd.org Sat Nov 28 14:53:44 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A8EF34A2E9C for ; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@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 4CjvdN45zMz3tTV for ; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 8CCEB4A2E9B; Sat, 28 Nov 2020 14:53:44 +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 8C95F4A2D1D for ; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjvdN3Xbkz3tTT; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606575224; 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=mAr26kX0B3KLu0R6kXMeJaYyheJbr6xLtEDV0xX3of8=; b=XZwZvwZGe5jTZ3t9U0nc/RtLW7axyIreBL5095Xq0HsWEbC22GHRrq4PP1727MwIIVjmDp uvrY4wlv9yx/yoIVu6V4gVw35xzu7tgiDdlGqTIpDJsXmW6E+EL2W3seqYdiIz1bhfh7lx HW+hC7Azc7hZ5PzwIRPEykygsCU/8DNPAr9pT7PFIqYHA27nou2wfZoC1ycQvM0rnI/BMR vXIGkDtaA1K/t24IcYTZ3/iOxYnXNV9PI/praPNxDGs8rKV/6NAMKKpOiDlUQnO7CzWGB/ ERWB338wj+fHb3gvf1HTRZjI+uXnn2xfYGRSpGGd6l2Ycb4JP52HVpdMVHbPeQ== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 6767819F3E; Sat, 28 Nov 2020 14:53:44 +0000 (UTC) Date: Sat, 28 Nov 2020 14:53:44 +0000 From: Rene Ladan To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: Dimitry Andric , git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128145344.GA2642@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> <20201128134045.GA35756@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606575224; 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=mAr26kX0B3KLu0R6kXMeJaYyheJbr6xLtEDV0xX3of8=; b=SP7NnVGh6xMQZT6LabczJ8FjPKefknJ5LX6wRYRYn41Oex/5L9EYkNc7c+ZpRGuRjaHUzD 5Pb7x+VX9Ef8nrYl9X/j7zEiUkqSKNAnqLiLMnesMi4U4b2UYjsgKGr4qAS374Ir01QOOb phf/TVeBZ1ajI0FaTMugm/Q+knpJB+Lctyx2mUQ7dv/fVwOnJQ3DK+xtF3ce3Sw/usF93B AAtFIfMnhycubHjzYvw6fxz9QWL3WovZpJEgNE7lxwfaexSYQW9hKvc4JTNDoib+ki6lH8 65Ik1TSIS3z0Hwxw+38Jb2FDc3FwYTzjsH6b5FhUs1mEzQfgAOVUED7n+ZmgLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606575224; a=rsa-sha256; cv=none; b=E2YMLxDpo+Ns+8DakgQmHHPN2lcV0h+1SDDTea1Zp7NpMl/SvBpmFMQsCTT/SuTv+fDmJY p7Qe2O8vNCerHfmxhw79+gPb8RbUSfutXwCy/QQ+SdfxBkQw5UHRHR2xTHLxIo7pudCry2 xK/HeGOYX4oC4G1XDsZzjeXGpITwaTA9QksjQGVAa4fSvq7XNMjZQjFelhdASxXt+WLKWL vq74vlMdAvhXbxhYgVAWvaHSCpnyyJE94YnDBi2wgfi7+K2FkxsuckH6umgCi/tu2KmcFw R8ILMm2xxUtk3VWil/YpUmPa5tzG2LKTRZnSUZs7JR8uwzqODv14i5bzhrMZcQ== 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, 28 Nov 2020 14:53:44 -0000 On Sat, Nov 28, 2020 at 03:07:14PM +0100, Ulrich Spörlein wrote: > On Sat, 2020-11-28 at 13:40:45 +0000, Rene Ladan wrote: > >On Sat, Nov 28, 2020 at 12:44:49PM +0100, Dimitry Andric wrote: > >> On 28 Nov 2020, at 12:38, Rene Ladan wrote: > >> > > >> > I just noticed that after doing a 'git pull' that the ports repository > >> > at cgit-beta seems to have diverged: > >> > > >> > rene@e17:/usr/freebsd/cgit-beta/ports % git status > >> > On branch main > >> > Your branch and 'origin/main' have diverged, > >> > and have 546213 and 528036 different commits each, respectively. > >> > (use "git pull" to merge the remote branch into yours) > >> > > >> > It took 5.85 seconds to compute the branch ahead/behind values. > >> > You can use '--no-ahead-behind' to avoid this. > >> > > >> > nothing to commit, working tree clean > >> > rene@e17:/usr/freebsd/cgit-beta/ports % git fetch > >> > rene@e17:/usr/freebsd/cgit-beta/ports % git pull > >> > fatal: refusing to merge unrelated histories > >> > rene@e17:/usr/freebsd/cgit-beta/ports % > >> > > >> > and what happened to those 18000 commits? > >> > >> I think you just missed Ulrich's heads-up mail :-) > >> > >> https://lists.freebsd.org/pipermail/freebsd-git/2020-November/000505.html > >> > >Yes, I was a bit too fast noticing myself ;) > > Yeah, sorry about that. I typically test new rulesets on my own machine > and compare the results first, somehow I only did this for src when I > did the history for the `access` file and for ports it lives not under > svnadmin but under head/CVSROOT and I somehow didn't test that, wanting > to get the change out and over with. > Uhm, `access` and `mentors` do live under svnadmin for ports, see https://svnweb.freebsd.org/ports/svnadmin/conf/ There is no head/CVSROOT in ports. René From owner-freebsd-git@freebsd.org Sat Nov 28 15:07:39 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 137B64A35FE for ; Sat, 28 Nov 2020 15:07:39 +0000 (UTC) (envelope-from uspoerlein@gmail.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 4CjvxQ68LQz4R7k for ; Sat, 28 Nov 2020 15:07:38 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mailman.nyi.freebsd.org (Postfix) id D2FF24A372F; Sat, 28 Nov 2020 15:07:38 +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 D2C304A382F for ; Sat, 28 Nov 2020 15:07:38 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (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 4CjvxP6fZ0z4R7j; Sat, 28 Nov 2020 15:07:37 +0000 (UTC) (envelope-from uspoerlein@gmail.com) Received: by mail-oi1-f174.google.com with SMTP id t143so9140798oif.10; Sat, 28 Nov 2020 07:07:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=4IoIp+v+JzmbozT41WWcXRetiwg/c6rNmh1EZFux+mg=; b=nEteNLHtH7EH3TbVds6LVXrKwHJioTpkGwKEG9xoTYdYR3r4V6pysET9k7OLta05Vi SvqHgsfbMGTCs25o5JX7aH3ACZ3GAiB84Lnx/SwzYyxtA98x1DZN5u5h+DXjQDE5Qyne jC8AxPZ2nBogq7efYo86Jejf6EFP8tYJgvvn7HRMhvJnmy3cI++GPlpQcfxZOBQA0J9+ SvfJ0Vy7Lq77XNwoV3gNU/AkHeKFCR4BK4IJFNREkM1VobFprR4G9ppPzq/uvEHgHCMS gkbWF6HKDLuz2XkApRdDOAQy5GXgC6MqLqMgbcy5TtaRrDx29xqxL0ZdCfU5maVgv2xv vKHA== X-Gm-Message-State: AOAM5331XltW9NP4CW0A8XZMSNJHWw6RL8Iwe5zLOt8v1QBZBGvISTdO zxeP/ZwbGsLJLfOrwE9h3HgB3iDLQO5SSdrOYo7m2yi6N4c= X-Google-Smtp-Source: ABdhPJwyXjzRde6ZXvlAw5g2f2RJI96ybHhoKoBXkbrqDFgIe0nvzK8fKATLyQC3UG/dyQVOkAjFpU4VtgfYHc10qT8= X-Received: by 2002:a54:4d8f:: with SMTP id y15mr7792219oix.150.1606576056431; Sat, 28 Nov 2020 07:07:36 -0800 (PST) MIME-Version: 1.0 References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> <20201128134045.GA35756@freefall.freebsd.org> <20201128145344.GA2642@freefall.freebsd.org> In-Reply-To: <20201128145344.GA2642@freefall.freebsd.org> From: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= Date: Sat, 28 Nov 2020 16:07:18 +0100 Message-ID: Subject: Re: cgit-beta ports repository diverged? To: Rene Ladan Cc: Dimitry Andric , git@freebsd.org X-Rspamd-Queue-Id: 4CjvxP6fZ0z4R7j X-Spamd-Bar: - Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of uspoerlein@gmail.com designates 209.85.167.174 as permitted sender) smtp.mailfrom=uspoerlein@gmail.com X-Spamd-Result: default: False [-1.32 / 15.00]; TO_DN_SOME(0.00)[]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; NEURAL_HAM_SHORT(-0.94)[-0.942]; FORGED_SENDER(0.30)[uqs@freebsd.org,uspoerlein@gmail.com]; MIME_TRACE(0.00)[0:+,1:+,2:~]; SUBJECT_ENDS_QUESTION(1.00)[]; FREEMAIL_ENVFROM(0.00)[gmail.com]; FROM_NEQ_ENVFROM(0.00)[uqs@freebsd.org,uspoerlein@gmail.com]; R_MIXED_CHARSET(0.62)[subject]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; DMARC_NA(0.00)[freebsd.org]; RBL_DBL_DONT_QUERY_IPS(0.00)[209.85.167.174:from]; SPAMHAUS_ZRD(0.00)[209.85.167.174:from:127.0.2.255]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.174:from]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.174:from]; RCVD_COUNT_TWO(0.00)[2]; RCVD_TLS_ALL(0.00)[]; MAILMAN_DEST(0.00)[git] 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: Sat, 28 Nov 2020 15:07:39 -0000 On Sat, Nov 28, 2020 at 3:53 PM Rene Ladan wrote: > On Sat, Nov 28, 2020 at 03:07:14PM +0100, Ulrich Sp=C3=B6rlein wrote: > > Yeah, sorry about that. I typically test new rulesets on my own machine > > and compare the results first, somehow I only did this for src when I > > did the history for the `access` file and for ports it lives not under > > svnadmin but under head/CVSROOT and I somehow didn't test that, wanting > > to get the change out and over with. > > > Uhm, `access` and `mentors` do live under svnadmin for ports, see > https://svnweb.freebsd.org/ports/svnadmin/conf/ > > There is no head/CVSROOT in ports. > > Ren=C3=A9 > Of course there is, only with r300894 was it moved from CVSROOT to svnadmin, see e.g. the view of the tree in a previous rev: https://svnweb.freebsd.org/ports/head/?pathrev=3D300000 and check the rev that moved things around: https://svnweb.freebsd.org/ports?view=3Drevision&revision=3D300894 Hope that clears things up Uli From owner-freebsd-git@freebsd.org Sat Nov 28 15:13:15 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 932224A3B11 for ; Sat, 28 Nov 2020 15:13:15 +0000 (UTC) (envelope-from rene@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 4Cjw3v3M4Yz4RTV for ; Sat, 28 Nov 2020 15:13:15 +0000 (UTC) (envelope-from rene@freebsd.org) Received: by mailman.nyi.freebsd.org (Postfix) id 731814A377F; Sat, 28 Nov 2020 15:13:15 +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 72DF24A39B5 for ; Sat, 28 Nov 2020 15:13:15 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Cjw3v279Mz4Rcs; Sat, 28 Nov 2020 15:13:15 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606576395; 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=atkXrqzJzZMbIA2qm28vWWs9sjXcI0sKZB9SllUJsPs=; b=H1CpkU2mRt7ifrcmhNfkip2ySPcTyjN0DFULeF8pYPiRUBwNibt1YJTB8FaNdbgnhY+Uk2 FAQc/ldNt9HkWH3qgTs9dJjyFWRZk+Y0gK+2I8kDIVW/WU2/1nCfgv0i63jH1Bn1EJGohy PhhZYRBb3mAcwe9pFjMPSq3j7OFB6/nDBGGJeDVCKKZ2hT4D8417HzRtVpNudKdpo8rT/u KsLKvv2FOn/SD+u1h7BDTH5X2HE3rVPomjMy74uoHOiBcCQTkOOB4WRQHGiD0VrjS7XPgy rtKAWREYyhkMv3shlr9da9Mpn0AZ4dbRbyWYx9ZUelQgh8RgOT5XpJ+MoGDveQ== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 30E131B50D; Sat, 28 Nov 2020 15:13:15 +0000 (UTC) Date: Sat, 28 Nov 2020 15:13:15 +0000 From: Rene Ladan To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: Dimitry Andric , git@freebsd.org Subject: Re: cgit-beta ports repository diverged? Message-ID: <20201128151315.GB10070@freefall.freebsd.org> References: <20201128113854.GA12390@freefall.freebsd.org> <02A9FD74-7FE5-4AFA-A7B0-7AA96C2FADA3@FreeBSD.org> <20201128134045.GA35756@freefall.freebsd.org> <20201128145344.GA2642@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606576395; 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=atkXrqzJzZMbIA2qm28vWWs9sjXcI0sKZB9SllUJsPs=; b=Y/82GAKPWfDbwl7xoQEuw8Yf+RBdTR39QUaIo6apG9k9k+EEoW2kTSWVlPMBRReg+hk4qG I09mv+BRSLyYJxoXWF8RXnEgrrUUcGY2uw4dDddC1q7CVNcGN0gW3safUykWiHqXdugW1B k/JmHt64TyP2IVMNdqDHEtHVRrTC4HHGjhDZT7MiF9Kb3a/8ERRitgHEzXZxhlW9uEGpfm sPamKDkz7m6dPkOf1GbB22S+zCHIKXbmE+6OUtp8ntv3JZf5bWf6NYTsym4+9BjiDWTCTq EYINa3PEoFclU5Ryh/G8Cnc+zquFad7eMedi1X9UCY2py8zSyVgPrOsq6ZAXug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606576395; a=rsa-sha256; cv=none; b=VcdRq9Yir/y9v5pQ2LBvRUjljUksrQZaWo35Ft5XSff6evXfHgb2dAappr5boxWmquSory 1QgIVuUT5KSmB4Q0y9a5D9RBhCDNcwCJR41p4ZkhLu44eIeMNrzJIHyO3ipnaB/5wV1FYi LN1d5jXXLJucVRAT2pl4jYf+diWmnlxqa0XDmbVoI89G3tYGntmc4r29cSaZjwcVebnXFJ ZkAMiFBeaksWu5tpDQ/VOTR0F6f7BUBinPXwqyZWSbRVDfCQc74WfiEcx1gyf2ffVR0pwl vgdysQy4KEl57uV4EPDoRekGUtjbJcmj/MqfEPzGe6GVN5MrDoORZO3oc9Xi1Q== 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, 28 Nov 2020 15:13:15 -0000 On Sat, Nov 28, 2020 at 04:07:18PM +0100, Ulrich Spörlein wrote: > On Sat, Nov 28, 2020 at 3:53 PM Rene Ladan wrote: > > > On Sat, Nov 28, 2020 at 03:07:14PM +0100, Ulrich Spörlein wrote: > > > Yeah, sorry about that. I typically test new rulesets on my own machine > > > and compare the results first, somehow I only did this for src when I > > > did the history for the `access` file and for ports it lives not under > > > svnadmin but under head/CVSROOT and I somehow didn't test that, wanting > > > to get the change out and over with. > > > > > Uhm, `access` and `mentors` do live under svnadmin for ports, see > > https://svnweb.freebsd.org/ports/svnadmin/conf/ > > > > There is no head/CVSROOT in ports. > > > > René > > > > Of course there is, only with r300894 was it moved from CVSROOT to > svnadmin, see e.g. the view of the tree in a previous rev: > https://svnweb.freebsd.org/ports/head/?pathrev=300000 > > and check the rev that moved things around: > https://svnweb.freebsd.org/ports?view=revision&revision=300894 > > Hope that clears things up It indeed looks you are right again :) Mea culpa René From owner-freebsd-git@freebsd.org Sat Nov 28 16:51:15 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 90E834A56BE for ; Sat, 28 Nov 2020 16:51:15 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CjyDz3n3Cz4XGR; Sat, 28 Nov 2020 16:51:15 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606582275; 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=guJrGxKYUkTMXZ4SgjjPss2X2r76LeyxEVd6wgypVeA=; b=jyT7me/5tfue6jlwKLl4o4k/eZtBoCsWpaObSdJy1kvFVd4mifhq/BeTkapJDAORx+QYNW YOcyDND+mZigfW1dLfb9ueP3RZaNIVY7pK1MTIr/kNf2QCXMH/xAWxvA0xHc4mUgLeQvHH l7Jd4MnvmJNEyHgTJAhK+qy4HOyk04UVQgSqTOKCjGwtZAAeX0/r82nxpOJkfWY5LHW8T/ dLteyrUEgs1SoW6q+XxGacnNMeROU51rFE2yi0eBPe2fbMH0/XcRT85wO9ywDfCbk/cuVt bSLhv78qyAb9aoUMMLcUIXVf8meO5Z/RsvWJJoDcXvfO7aS8SXu51bMLHtG6rA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 6F5E91BE6E; Sat, 28 Nov 2020 16:51:15 +0000 (UTC) Date: Sat, 28 Nov 2020 16:51:15 +0000 From: Rene Ladan To: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= Cc: freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128165115.GA22587@freefall.freebsd.org> References: MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606582275; 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=guJrGxKYUkTMXZ4SgjjPss2X2r76LeyxEVd6wgypVeA=; b=lUuU2EIatFL/oasjAsndnxc7r9WtE1Ztnk4jDwit6s2LvgW4gswZonS/6dd6F2CB3X9Fij O7/jlFVIkaQmk5yHfNH3Zm5NAQd9oUNhuW6ZZv/rghlfmwd+xzjrCxMd+ek4r/yyCwWiHx W2zK5ydXUajuy10nWm1rwcZyOsaeIsq3vh4hYGT5aFAUKwXu2Hs26XSSLBj8kh1ODXw0VI wiEx6WV5UX1OyYRm6iGBZP7/Dpd2MNBt0AyL1gqN/5RIauVA/+DpvFX8W2CJvxxL6GATro uINsdl2AocVxKIfNAcxqbL2irpuG9H+h45lf2oCwCHASRCDi6w24/12gkWBytg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606582275; a=rsa-sha256; cv=none; b=hUAtOlBPMbkcpBVRQmBOME2wOgD6ysgUvWslK0Bx0ImEe+3AzCwT3JhbMgjYNl+8sR/wJI n1tv11BUB8JX3uawI8okQPBzfZN9EJKGkvwLBG619uxMdyCYo9KjHpec+vknB8eDjnSabN 76z1zDGfN0fRp8+Pem4O6Wm/KmoRHZUav9i5ovl5ztutPFN3zoQUccQUxyMsSxzlBol78Z v0HxaRHxlhpFr5fVo8Nw+v6Jy7I+hO2CjAPxnaUY9vpiMFLg9aJ6FWnUK2158brtTZ2PqC z8xtkXb4/7kZy4zhrCIGVFCE1o2SfPqaw+BRT3BYg92v8D81wOR4UjCPeRbgvw== 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, 28 Nov 2020 16:51:15 -0000 On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Spörlein wrote: > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote: > >Hi folks, bad news > > > >While carving out the history of the access and mentors file (we want to > >retain that for historical analysis, which people seem to do from time > >to time), I overlooked that fact that the previous runs for ports did > >contain all of CVSROOT, but the new one, by necessity would not contain > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix > >from the latest rules file. It should never have been there in the first > >place. :( > > > >All that is to say that this of course means all the git commit hashes > >for the ports tree have changed. Oops. > > > >Sorry about that, please let me know if you need help in transplanting > >your work from old hashes to new hashes. > The web finds [1] which would translate to git merge orgin main --allow-unrelated-histories but I'm not sure if this is the correct hammer? [1] https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68 René From owner-freebsd-git@freebsd.org Sat Nov 28 18:13:58 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id CEA3D4A6F55 for ; Sat, 28 Nov 2020 18:13:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from smtp-out-no.shaw.ca (smtp-out-no.shaw.ca [64.59.134.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ck04P6Yvzz4bkB for ; Sat, 28 Nov 2020 18:13:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from spqr.komquats.com ([70.67.229.168]) by shaw.ca with ESMTPA id j4jLkw8Ub34axj4jMkQUGF; Sat, 28 Nov 2020 11:13:56 -0700 X-Authority-Analysis: v=2.4 cv=LvQsdlRc c=1 sm=1 tr=0 ts=5fc29364 a=7AlCcx2GqMg+lh9P3BclKA==:117 a=7AlCcx2GqMg+lh9P3BclKA==:17 a=xqWC_Br6kY4A:10 a=kj9zAlcOel0A:10 a=nNwsprhYR40A:10 a=bv4Z-FHaAAAA:8 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=EkcXrb_YAAAA:8 a=IMn6Ac0jDsVeSd3pFR0A:9 a=CjuIK1q_8ugA:10 a=1OByGr4bXvbdRoVEmkj7:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [IPv6:fc00:1:1:1::5b]) by spqr.komquats.com (Postfix) with ESMTPS id 5313325D3 for ; Sat, 28 Nov 2020 10:13:55 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.16.1/8.16.1) with ESMTP id 0ASIDtel050860 for ; Sat, 28 Nov 2020 10:13:55 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <202011281813.0ASIDtel050860@slippy.cwsent.com> X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.7.1 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: freebsd-git@freebsd.org Subject: MFC Trackers Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Sat, 28 Nov 2020 10:13:55 -0800 X-CMAE-Envelope: MS4xfLC4GM2XyjxdSRbTdG7ZWQri6Q6/efQHOp/si2i1q8yg+AZtewsCzT0sJDyatQ5yj2i8sjfOPiLwgSmlcW7RiEPiM6rOuZxOxEhZJzLvZOpBLELKIN1t aXO/IGSoS7vvAu6p8HBcjvw9hHspqQSCAXwmfP2WiVujS//GL7yuDoPeLgSN5wCpB22qliPrgjxiYO/iDiEBq8uKnEo4qEm52ok= X-Rspamd-Queue-Id: 4Ck04P6Yvzz4bkB X-Spamd-Bar: / Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=none (mx1.freebsd.org: domain of cy.schubert@cschubert.com has no SPF policy when checking 64.59.134.9) smtp.mailfrom=cy.schubert@cschubert.com X-Spamd-Result: default: False [-0.24 / 15.00]; HAS_REPLYTO(0.00)[Cy.Schubert@cschubert.com]; RCVD_VIA_SMTP_AUTH(0.00)[]; RWL_MAILSPIKE_GOOD(0.00)[64.59.134.9:from]; MV_CASE(0.50)[]; TO_DN_NONE(0.00)[]; RCVD_COUNT_THREE(0.00)[4]; RECEIVED_SPAMHAUS_PBL(0.00)[70.67.229.168:received]; MIME_TRACE(0.00)[0:+]; RBL_DBL_DONT_QUERY_IPS(0.00)[64.59.134.9:from]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:6327, ipnet:64.59.128.0/20, country:CA]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; REPLYTO_EQ_FROM(0.00)[]; FROM_HAS_DN(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[freebsd-git@freebsd.org]; DMARC_NA(0.00)[cschubert.com: no valid DMARC record]; AUTH_NA(1.00)[]; RCPT_COUNT_ONE(0.00)[1]; SPAMHAUS_ZRD(0.00)[64.59.134.9:from:127.0.2.255]; RCVD_IN_DNSWL_LOW(-0.10)[64.59.134.9:from]; RCVD_TLS_LAST(0.00)[]; NEURAL_SPAM_SHORT(0.46)[0.462]; R_SPF_NA(0.00)[no SPF record]; 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, 28 Nov 2020 18:13:58 -0000 Hi, Will Maxim Sobolev's MFC reminder email service and the MFC tracker at https://mfc.kernelnomicon.org/6/ be updated for git when git becomes the official thing in FreeBSD? -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org The need of the many outweighs the greed of the few. From owner-freebsd-git@freebsd.org Sat Nov 28 20:41:16 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 0095446A1FB for ; Sat, 28 Nov 2020 20:41:16 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (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 4Ck3LM2Rq2z4jwY for ; Sat, 28 Nov 2020 20:41:15 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x736.google.com with SMTP id v143so7449529qkb.2 for ; Sat, 28 Nov 2020 12:41:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ye0mY7sBqYC0aQNRvKn+/rGISVubgQNCQFJ64L6+bf4=; b=PUOtmRTLbejjWj2xA46zzLE1sdti3Vssnw8dyNYpv9AjVvHUyQ4WV//GU5rOKKF9oo +LuOhe4P8jDHBYpuIgQsQWlP1qaT0NrBnRubIJvjY7IfuYo7LQ4cmtLGzzhuU0L56XOK ZE8dQI5JvG3tpmjGzkQip+t+7gSelkQiyTIJnyTzxarH9jBEDbQJFLLzIdHIBniAgLGD rkmjNitSJ4JWZwEPX+o7w3ytwWcC9azcVxIMy7aw4A7AVhXfwxFBWJ9TG6F2+OK7AzlO e/iNUJ8jnr2KqzKDg/93tvWr5SbmvkTHbcmD8w62VqJeZF1t4BJiFOVu+XUg8XG1BoRB 3TDQ== 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=ye0mY7sBqYC0aQNRvKn+/rGISVubgQNCQFJ64L6+bf4=; b=iq+e4Q5080AyhCeVzLTXoOFGfFe6L1FY1/GUYfB6kEug949010qees6Wm15Jwqo5TA dqSWU5HH6gCwNBQmvf4lJqBcQtTJCZKuvY5iSpkJDoJUe8FJoqXGAjQThoWRe2H4KOwI 4F3h4JCkOxt2FeA7hI59n+YDGfcWf4zSzalhap4q/8vhQaCR7gxLKd/f1sNxSjKUkvP5 5C55p/EJC6El1OUqQJw7lcuspNCLZD40OzJ/AEyngXNfkOVaxZjZOPLfBqW07IHDMaIS esvQzbqYL9xGumuz2OaWzKEd6n/kG52lQSbpf73H5E0+I5JlddSldVPRPYRMrS6BK+Yr D9EA== X-Gm-Message-State: AOAM531Ex3vPCZQLhqNy0meTGsxuOnQRsSGkpw394qP5OfvBEYSxznZ1 B8e9muVpD6TqA0IZFVepxsAbPRTMxtasaONFRyrlOQkkPqQh6A== X-Google-Smtp-Source: ABdhPJxwizTK8MoF0bTLgyrm4IASgKiA5e9W32nQ1WMjUFNy3ITucGPEKGo2SuuUcaDDghIwSrfsvuRtHeWkL9rsndE= X-Received: by 2002:a37:78c:: with SMTP id 134mr15541880qkh.359.1606596072995; Sat, 28 Nov 2020 12:41:12 -0800 (PST) MIME-Version: 1.0 References: <20201128165115.GA22587@freefall.freebsd.org> In-Reply-To: <20201128165115.GA22587@freefall.freebsd.org> From: Warner Losh Date: Sat, 28 Nov 2020 13:41:02 -0700 Message-ID: Subject: Re: HEADS UP: freebsd-ports hashes were all changed To: Rene Ladan Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Ck3LM2Rq2z4jwY X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=PUOtmRTL; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::736) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(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::736:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::736:from]; 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::736:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.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, 28 Nov 2020 20:41:16 -0000 On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Sp=C3=B6rlein wrote: > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Sp=C3=B6rlein wrote: > > >Hi folks, bad news > > > > > >While carving out the history of the access and mentors file (we want = to > > >retain that for historical analysis, which people seem to do from time > > >to time), I overlooked that fact that the previous runs for ports did > > >contain all of CVSROOT, but the new one, by necessity would not contai= n > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix > > >from the latest rules file. It should never have been there in the fir= st > > >place. :( > > > > > >All that is to say that this of course means all the git commit hashes > > >for the ports tree have changed. Oops. > > > > > >Sorry about that, please let me know if you need help in transplanting > > >your work from old hashes to new hashes. > > > The web finds [1] which would translate to > > git merge orgin main --allow-unrelated-histories > > but I'm not sure if this is the correct hammer? > > [1] > https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L= 58-L68 > I'm not sure either. What does your tree look like? Is it just tracking upstream? Or do you have changes / branches? Warner From owner-freebsd-git@freebsd.org Sat Nov 28 20:55:28 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 6631C46AA02 for ; Sat, 28 Nov 2020 20:55:28 +0000 (UTC) (envelope-from rene@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ck3fm2N9gz4knv; Sat, 28 Nov 2020 20:55:28 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606596928; 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=wm1PxJnwxlhUdZeGwZEBnwC5JTE2t3mdDDYEhQMEzRE=; b=d0Ks4al/4UUIXB4Gmsa8B92ZTjdRHDXGvcwE0PoHTsrg+eO5naj/uYgfdelrl6ejqyLy/j /zDuIj1BVClP4gm6wJaKMcvQVzFGW0dZDcb/OFAgUggVE2S02WF3HfSDpVGuztxAriMwmw Vr6a4/BgQK5w0f4aGn5c/v4WkzbjnA7xO4WqjjYgkNdTvA2zjQQk7kcWNCoLPA+bb+emN3 ITzSOCY4D8CgLrKuGrZewdpPc5whztamPSQ1VM1uCNInloNnPaOgJR9ZY8cDWsJcmAxFX8 OGQ8MnwBFYOZA2RcPKk8pT7cRSOyPFJJG0HQnjcI8OhdDfj4cxAQntqZJqv75w== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 428071DE96; Sat, 28 Nov 2020 20:55:28 +0000 (UTC) Date: Sat, 28 Nov 2020 20:55:28 +0000 From: Rene Ladan To: Warner Losh Cc: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= , freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128205528.GA58416@freefall.freebsd.org> References: <20201128165115.GA22587@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606596928; 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=wm1PxJnwxlhUdZeGwZEBnwC5JTE2t3mdDDYEhQMEzRE=; b=DMT51kjtE7g2I8qhK43a7bp60F+n1HupNPoZ5JGu0Tl7hUCk4D+fca9pIi8Fa0OA9GlDgr y4xSmv6k+JQVvU7N6GJGWe4LAvE26xFspVooM0wJ3gFE/Gp5ucWSRl39+Sz9hOfuCUxfKr wOLIGq4oJ/jKNydrcMs7CRyFkPZnVaASQ60vOYFXZ0+Wfx47QtHCHYmDZbS9jXApUzFbZA lKgnYUIDxo/HUn1nhd4g2QBCiQpsqgg6qLbn7Gyuv4BHsex1vOPMrM9KFlkoHR17Tclasc gvS4AmPDUSKf+de3P8YTPtQb2Rjsnc4etvT9TBkJ1WvAgOuyWzm1c6IMS4oZFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606596928; a=rsa-sha256; cv=none; b=uo7ZYOnq1MZ0pJOZfENeFoec/suqHDD1QsTrnawy5oBHTb08eX7edCzTqmNNfwK72mQm4I PViF19PiDY7nD1l0TZYDyByKklNWcvzvIVdhkfwlEGZLGu9Vgvbysu0Q9e2p7553XMkiKO CJnA7KGmQVCRH7L2gsixsgXDjjon9g5Zu2mTlxSuynchiFUTTTNQD6YalRu1a4/3G54dMi d1sSdWoa+iJaqix7T5n3gzEgay4ZINmQCWIqlYiRosbZwA/lEryacIURzlDdCIW8D4X6Yx 3pXZTTrxg5vNONeWxhvkgrMqzv/e77lh9s5NZ8hCfb6ZrS9scBSR60r2cXyt6Q== 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, 28 Nov 2020 20:55:28 -0000 On Sat, Nov 28, 2020 at 01:41:02PM -0700, Warner Losh wrote: > On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > > > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Spörlein wrote: > > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote: > > > >Hi folks, bad news > > > > > > > >While carving out the history of the access and mentors file (we want to > > > >retain that for historical analysis, which people seem to do from time > > > >to time), I overlooked that fact that the previous runs for ports did > > > >contain all of CVSROOT, but the new one, by necessity would not contain > > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT prefix > > > >from the latest rules file. It should never have been there in the first > > > >place. :( > > > > > > > >All that is to say that this of course means all the git commit hashes > > > >for the ports tree have changed. Oops. > > > > > > > >Sorry about that, please let me know if you need help in transplanting > > > >your work from old hashes to new hashes. > > > > > The web finds [1] which would translate to > > > > git merge orgin main --allow-unrelated-histories > > > > but I'm not sure if this is the correct hammer? > > > > [1] > > https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68 > > > > I'm not sure either. What does your tree look like? Is it just tracking > upstream? Or do you have changes / branches? > I have a few local branches for some WIP things that I keep in sync with main. None of those are pushed obviously. If all else fails I can just reclone the repository and recreate those branches, they are of a temporary nature. René From owner-freebsd-git@freebsd.org Sat Nov 28 21:49:57 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 7683C46BA68 for ; Sat, 28 Nov 2020 21:49:57 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-qk1-x733.google.com (mail-qk1-x733.google.com [IPv6:2607:f8b0:4864:20::733]) (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 4Ck4sc5gklz4nnb for ; Sat, 28 Nov 2020 21:49:56 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: by mail-qk1-x733.google.com with SMTP id u4so7508199qkk.10 for ; Sat, 28 Nov 2020 13:49:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=kXVhlBcVzaFd+1G78PsPS/C+dsAVJVf/uSFKyU0vYhc=; b=V7UHHFVeoET5QakI8IjTwysBkPnAVReHUua1ffltsGe/SKwRS2oygmJ1120dfdrg67 Mu01Uy038lUQywfFvr8yPRuK54QvgsQW7Ux4fCG1dqsO1RoChFTttPGZ8Ou5tDI2ogyq /6cTi10CzmJogwYJ4hw01/zxWzmORpuKu0KsphSWTMRugzswwwdCUW23rChk7Zr+qrh6 pyBKD440c4kvS0cQNzNnvjbO9gTaS4Nnny1/qEZ7qtoB0fkotIhdTLL6YQLF9fpihq5+ X94cyUbvM7WPP836YXpxzE/36hIFG8MFVmGKWO2bcqcjTPyRDwC0Tg3kEIsysxK+a769 l4zA== 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=kXVhlBcVzaFd+1G78PsPS/C+dsAVJVf/uSFKyU0vYhc=; b=E6su9fCDpGhnz/69rtsm1o7qg5Am3NZbA1C/s3YGzU8+IPaJeAhOUCD4yFTK8Mb90E YDYyKCwHwGISO3c8CzBPs20OzbnebQOJ6s7Awo5Scey4+hKEscApOpe/fGCnASYDK968 c+/1FX16yXZaw7/+VQrsPz2TyXH9ml+0Xr6Red+XLBMCKLQZokFcEuwLQOUNR5hqcuf8 3T3eYUJsq/FTJGZYRYOoeaTay2+PFH069Y6Ln0U9V5Z/0SJFtzhFaiQSgZs/RfHN7ngS HQwOwowAHfwKjW6XFkgpcrmi9ZTAutldsUI1LNoGIPQ6VbhI8p+Z7GrfX3e96fAdqOwK Y4ZQ== X-Gm-Message-State: AOAM530w/2VH8p3PFtPbCej9rdcv5VjaRpzXCqYe1HcXAA5rgZAxS0HW mLiHDkwVTPUp5kNww/CvfcbKAp/UaKa0+rtMU4l6cg== X-Google-Smtp-Source: ABdhPJzAuvH2l4YBo6/b2tRmelOVkjYcJlTfsi4uWQlZP4oRq+aAjeEs82yVtCeFNVS14l9S7NmfyEKem4IdNQ81t8s= X-Received: by 2002:a05:620a:88e:: with SMTP id b14mr15716471qka.195.1606600195719; Sat, 28 Nov 2020 13:49:55 -0800 (PST) MIME-Version: 1.0 References: <20201128165115.GA22587@freefall.freebsd.org> <20201128205528.GA58416@freefall.freebsd.org> In-Reply-To: <20201128205528.GA58416@freefall.freebsd.org> From: Warner Losh Date: Sat, 28 Nov 2020 14:49:44 -0700 Message-ID: Subject: Re: HEADS UP: freebsd-ports hashes were all changed To: Rene Ladan Cc: =?UTF-8?Q?Ulrich_Sp=C3=B6rlein?= , freebsd-git@freebsd.org X-Rspamd-Queue-Id: 4Ck4sc5gklz4nnb X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=pass header.d=bsdimp-com.20150623.gappssmtp.com header.s=20150623 header.b=V7UHHFVe; dmarc=none; spf=none (mx1.freebsd.org: domain of wlosh@bsdimp.com has no SPF policy when checking 2607:f8b0:4864:20::733) smtp.mailfrom=wlosh@bsdimp.com X-Spamd-Result: default: False [-3.00 / 15.00]; RCVD_TLS_ALL(0.00)[]; ARC_NA(0.00)[]; R_DKIM_ALLOW(-0.20)[bsdimp-com.20150623.gappssmtp.com:s=20150623]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[3]; TO_DN_SOME(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::733:from:127.0.2.255]; TO_MATCH_ENVRCPT_SOME(0.00)[]; DKIM_TRACE(0.00)[bsdimp-com.20150623.gappssmtp.com:+]; NEURAL_HAM_SHORT(-1.00)[-1.000]; RCVD_IN_DNSWL_NONE(0.00)[2607:f8b0:4864:20::733:from]; 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::733:from]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US]; FROM_NEQ_ENVFROM(0.00)[imp@bsdimp.com,wlosh@bsdimp.com]; MAILMAN_DEST(0.00)[freebsd-git]; RCVD_COUNT_TWO(0.00)[2] Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.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, 28 Nov 2020 21:49:57 -0000 On Sat, Nov 28, 2020 at 1:55 PM Rene Ladan wrote: > On Sat, Nov 28, 2020 at 01:41:02PM -0700, Warner Losh wrote: > > On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > > > > > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Sp=C3=B6rlein wrote: > > > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Sp=C3=B6rlein wrote: > > > > >Hi folks, bad news > > > > > > > > > >While carving out the history of the access and mentors file (we > want to > > > > >retain that for historical analysis, which people seem to do from > time > > > > >to time), I overlooked that fact that the previous runs for ports > did > > > > >contain all of CVSROOT, but the new one, by necessity would not > contain > > > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT > prefix > > > > >from the latest rules file. It should never have been there in the > first > > > > >place. :( > > > > > > > > > >All that is to say that this of course means all the git commit > hashes > > > > >for the ports tree have changed. Oops. > > > > > > > > > >Sorry about that, please let me know if you need help in > transplanting > > > > >your work from old hashes to new hashes. > > > > > > > The web finds [1] which would translate to > > > > > > git merge orgin main --allow-unrelated-histories > > > > > > but I'm not sure if this is the correct hammer? > > > > > > [1] > > > > https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L= 58-L68 > > > > > > > I'm not sure either. What does your tree look like? Is it just tracking > > upstream? Or do you have changes / branches? > > > I have a few local branches for some WIP things that I keep in sync with > main. > None of those are pushed obviously. If all else fails I can just reclone > the > repository and recreate those branches, they are of a temporary nature. > OK. So, at this point, 'main' locally is the old hash, and 'origin/main' is the new hash. I'd recommend the following. What it does is creates an 'oldmain' branch to match the current repo, then recreates the new hash main as 'main' and then rebases all your WIP branches to main with the new hashes. It looks a bit scary, I'll grant, but I've done similar things a lot. If any is unfamiliar, then reading the man page first is a good idea. If things go wrong, then 'git reflog' will help you recover the values for old branches, etc. git rebase --abort is your friend if it's going horribly sideways... (1) Create a new name for the old main: % git checkout main % git checkout -b oldmain (2) Now, make main point to the new hashes % git checkout -B main origin/main (3) now, for each of your WIP branches, rebase them (I have -i here, but that's finger memory). % git rebase -i oldmain $WIPNAME --onto main (4) if you really want, you can now delete oldmain, though I'd keep it around for a while. % git branch -D oldmain Make sense? Oh, if it does go terribly sideways, and you need to just reclone into a new directory, you can check out http://bsdimp.blogspot.com/2020/08/how-to-transport-branch-from-one-git.htm= l which will show you how to use git format-patch and git am to move the branches to the new repo. Again, git reflog can help if branch names get screwed up since that's as close as git gets to keeping meta-data history..= . And please let me know if it works, or if you encounter any issues. Warner From owner-freebsd-git@freebsd.org Sat Nov 28 22:22:06 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id E862146CB44 for ; Sat, 28 Nov 2020 22:22:06 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ck5Zk6Jp8z4qjw; Sat, 28 Nov 2020 22:22:06 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606602126; 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=ug86aGvwMvWAwVDwzVYpMwV+BJKmk4obxeFFkUjIcBU=; b=V4RT0Tn2kOlc56xMWJiJuU0S5wKrLkITi9ZhV8z9LMwi6w7dzxG19IGMXO5N1HOpFv7SGh l3njWRxdE6WAUgGLdgNMpKSK9Ld2AfYXJkKam+LqCTTVkHU66o5seAkR51kLS+YsbNOIm7 4f1oiACaavt3IRmaq1GpFixGtB5LEJLGQNu8/NklRJ237Fa/+2K/l3FJBUW5KYbfPJXjYH SN916+VjB/VrxKpLAMDK10gfMM8J2gw9JY2V22fvuI0CQIPzKAePW5tiu0eVt53RNY9xaa QrgccDy7fu2Qz32elkURNL6Cu9n6NjcgrMWwbNlDK36GvYOBCfx7Ob05hjbpYw== Received: by freefall.freebsd.org (Postfix, from userid 1185) id C78371F215; Sat, 28 Nov 2020 22:22:06 +0000 (UTC) Date: Sat, 28 Nov 2020 22:22:06 +0000 From: Rene Ladan To: Warner Losh Cc: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= , freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128222206.GA42737@freefall.freebsd.org> References: <20201128165115.GA22587@freefall.freebsd.org> <20201128205528.GA58416@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606602126; 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=ug86aGvwMvWAwVDwzVYpMwV+BJKmk4obxeFFkUjIcBU=; b=E03fb85ifgu05lFsi4h9VgPigSBmRYA2a8afjknRMuD1HUjE9g4xoLy39x29rDt4Fh7YIN zpufTTXKESgwcTWQssjo+4ANX0LiqYzlA1iEzR7QPbNlDfFCpccEnqnWNUd6U2dMo2AY1p oyneymPVikZzequYxaVjyA240U/2ZX5lXDQaGbAGtEbU6FiO4g1/4oweFr2d3jY1gX2OlU l4BxHuydRlFS3N1j57XIK+dVdoiWurtJ1jChavBnjEi2G3pHwEPeviYqvuXE0vj0p/3fMo zOEijTOsqX9tkVveCg+Rf+MbRUNCi1EkMzJB6gtF/UmqyW+MeLFRyLJBDZQf5g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606602126; a=rsa-sha256; cv=none; b=RaD8BvrExyA0nPFHZ/52Tkyq9SwI5GolkqWtVQHX01Lp6nunMQ20IggSM+9v0kL8nRxsqS IoSaVPxlSehZwmirrx8fXnJBHnFrP8xe8TyBdvvumii7WCc0xogqZzHnxzze+cWpTNrqry dAZQsCw+85GxzRg0SzNEzN4xe/id7HeWEkRqTdjVeAPyafF3OujhCThoz2DkpFf5JaVsNq B+5wmMHqpRyJK4Yi5R8sqsyZNgzAkB/pJDlCm7K5Ecgm/kgmfLCALT872ntlEStiC7Vzuk 6iZpG6bhTxg6hVOWqSnJbjj+r0PKhQfwqD/scIxI9pVJmC7LmReU0cO1LeYAew== 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, 28 Nov 2020 22:22:07 -0000 On Sat, Nov 28, 2020 at 02:49:44PM -0700, Warner Losh wrote: > On Sat, Nov 28, 2020 at 1:55 PM Rene Ladan wrote: > > > On Sat, Nov 28, 2020 at 01:41:02PM -0700, Warner Losh wrote: > > > On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > > > > > > > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Spörlein wrote: > > > > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote: > > > > > >Hi folks, bad news > > > > > > > > > > > >While carving out the history of the access and mentors file (we > > want to > > > > > >retain that for historical analysis, which people seem to do from > > time > > > > > >to time), I overlooked that fact that the previous runs for ports > > did > > > > > >contain all of CVSROOT, but the new one, by necessity would not > > contain > > > > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT > > prefix > > > > > >from the latest rules file. It should never have been there in the > > first > > > > > >place. :( > > > > > > > > > > > >All that is to say that this of course means all the git commit > > hashes > > > > > >for the ports tree have changed. Oops. > > > > > > > > > > > >Sorry about that, please let me know if you need help in > > transplanting > > > > > >your work from old hashes to new hashes. > > > > > > > > > The web finds [1] which would translate to > > > > > > > > git merge orgin main --allow-unrelated-histories > > > > > > > > but I'm not sure if this is the correct hammer? > > > > > > > > [1] > > > > > > https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68 > > > > > > > > > > I'm not sure either. What does your tree look like? Is it just tracking > > > upstream? Or do you have changes / branches? > > > > > I have a few local branches for some WIP things that I keep in sync with > > main. > > None of those are pushed obviously. If all else fails I can just reclone > > the > > repository and recreate those branches, they are of a temporary nature. > > > > OK. So, at this point, 'main' locally is the old hash, and 'origin/main' is > the new hash. > > I'd recommend the following. What it does is creates an 'oldmain' branch to > match the current repo, then recreates the new hash main as 'main' and then > rebases all your WIP branches to main with the new hashes. It looks a bit > scary, I'll grant, but I've done similar things a lot. If any is > unfamiliar, then reading the man page first is a good idea. If things go > wrong, then 'git reflog' will help you recover the values for old branches, > etc. git rebase --abort is your friend if it's going horribly sideways... > > (1) Create a new name for the old main: > % git checkout main > % git checkout -b oldmain > > (2) Now, make main point to the new hashes > % git checkout -B main origin/main > > (3) now, for each of your WIP branches, rebase them (I have -i here, but > that's finger memory). > % git rebase -i oldmain $WIPNAME --onto main > This mostly worked fine. There were some hiccups with one somewhat outdated branch which could all be fixed with some manual merge conflicts I think. > (4) if you really want, you can now delete oldmain, though I'd keep it > around for a while. > % git branch -D oldmain > I'll just keep it around for a while. > Make sense? Oh, if it does go terribly sideways, and you need to just > reclone into a new directory, you can check out > http://bsdimp.blogspot.com/2020/08/how-to-transport-branch-from-one-git.html > which will show you how to use git format-patch and git am to move the > branches to the new repo. Again, git reflog can help if branch names get > screwed up since that's as close as git gets to keeping meta-data history... > > And please let me know if it works, or if you encounter any issues. > Thanks for the instructions! René From owner-freebsd-git@freebsd.org Sat Nov 28 22:49:27 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AE81246D0FD for ; Sat, 28 Nov 2020 22:49:27 +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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ck6BH4XxZz4rTc; Sat, 28 Nov 2020 22:49:27 +0000 (UTC) (envelope-from rene@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606603767; 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=h6Rso+gw/Y6H9gTjpYUNAW++rASy6SRZ9VBdFKEqa0c=; b=it/w28DWX9yK0I7UNJ7fdU2ZN3PxVwF+DIVnJG98nlkRLfOOaDKDkG0F79xF2QtyO7hZKB qPrQTeOpSvkO7olATeuSiRMYbaovSMEF56DAmijsjpL232ZduDgthNFquEelOzqn6i9RsC jzeK7Z/yXfhqaOxUUXe9kmwDhR+qLmNmLb3Yu/qM/WxOd8DzaPGKcHE5u0aiHBJhzuAprH X867yRDWwKE/3vV8j0ipe+OW9K9wAEnesduRQlJ6mUbu9TeBdxRSuEWL2xuPeD+qOjK+9L I8ds0zdD8GbP2q4zX1Mjk2du7Cy1IYXkhrer8cwZpyrdc3adHuVaEG8vCN9vEA== Received: by freefall.freebsd.org (Postfix, from userid 1185) id 8D10B1F44B; Sat, 28 Nov 2020 22:49:27 +0000 (UTC) Date: Sat, 28 Nov 2020 22:49:27 +0000 From: Rene Ladan To: Warner Losh Cc: Ulrich =?iso-8859-1?Q?Sp=F6rlein?= , freebsd-git@freebsd.org Subject: Re: HEADS UP: freebsd-ports hashes were all changed Message-ID: <20201128224927.GC42737@freefall.freebsd.org> References: <20201128165115.GA22587@freefall.freebsd.org> <20201128205528.GA58416@freefall.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1606603767; 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=h6Rso+gw/Y6H9gTjpYUNAW++rASy6SRZ9VBdFKEqa0c=; b=OFJpsqu69k4DGD+zIFyg7Bk3xk4NY3tuY2lIKlxndf+GB6zeRW9wi+xyG71HrbBrm2mb0e b9kmUVxx1uqPnQpfZQpar/TsbxSUCSXnrTrbgCKShY3Im6vavMsjObz8aMQmfMJCcrMf4Y 41R4uKELHKudjUYzAeBHeEI9R1YypwQNR6Z0JKmQ1LYuJHbKkGEWD8yQH6l3SRwyQEudWg aPwDKWlrB97ZsJHzV9e0xucbQAXPHq9ZD2owuopwggT5zcEbESSnxvlK7UMU9L9IMR747D I/VGxdw9fa3vFeUgFRXOmc5FQgj6jkcQ6SuC295J1G57AUVR2Xqt74KHos//BQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1606603767; a=rsa-sha256; cv=none; b=RwRSw42lpuqUrDha3zYgLACqrQ9Re1Qm9tgGnROQD2vgmSCVH8hRw9XKizP6N48p60H87e umwGc21aKykPv6NdokOTs72+YGNuHIWG/G1tjWWYF1hb3Rv47dA1qKrWo57aFjnO/FN8oZ gtGjQcukCS6xzS08W9jHjobCBtZyvqUEu6LiLrgIwfF0Y4Qqa27MbfPsjHeASPxF46lQbt xcWTA+IJHFer8uyDuXJcDO756QQbfnrW3R3jhSDIur70PH8vJr1YNLc9O7bvDPiEGPK04s hKPgtd7+sCSua5VR1bZGcpE/yfjaJOPO4HKS5e7s/pqwb/vCerVXZhY7WdEqfw== 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, 28 Nov 2020 22:49:27 -0000 On Sat, Nov 28, 2020 at 02:49:44PM -0700, Warner Losh wrote: > On Sat, Nov 28, 2020 at 1:55 PM Rene Ladan wrote: > > > On Sat, Nov 28, 2020 at 01:41:02PM -0700, Warner Losh wrote: > > > On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > > > > > > > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Spörlein wrote: > > > > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Spörlein wrote: > > > > > >Hi folks, bad news > > > > > > > > > > > >While carving out the history of the access and mentors file (we > > want to > > > > > >retain that for historical analysis, which people seem to do from > > time > > > > > >to time), I overlooked that fact that the previous runs for ports > > did > > > > > >contain all of CVSROOT, but the new one, by necessity would not > > contain > > > > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT > > prefix > > > > > >from the latest rules file. It should never have been there in the > > first > > > > > >place. :( > > > > > > > > > > > >All that is to say that this of course means all the git commit > > hashes > > > > > >for the ports tree have changed. Oops. > > > > > > > > > > > >Sorry about that, please let me know if you need help in > > transplanting > > > > > >your work from old hashes to new hashes. > > > > > > > > > The web finds [1] which would translate to > > > > > > > > git merge orgin main --allow-unrelated-histories > > > > > > > > but I'm not sure if this is the correct hammer? > > > > > > > > [1] > > > > > > https://github.com/git/git/blob/master/Documentation/RelNotes/2.9.0.txt#L58-L68 > > > > > > > > > > I'm not sure either. What does your tree look like? Is it just tracking > > > upstream? Or do you have changes / branches? > > > > > I have a few local branches for some WIP things that I keep in sync with > > main. > > None of those are pushed obviously. If all else fails I can just reclone > > the > > repository and recreate those branches, they are of a temporary nature. > > > > OK. So, at this point, 'main' locally is the old hash, and 'origin/main' is > the new hash. > > I'd recommend the following. What it does is creates an 'oldmain' branch to > match the current repo, then recreates the new hash main as 'main' and then > rebases all your WIP branches to main with the new hashes. It looks a bit > scary, I'll grant, but I've done similar things a lot. If any is > unfamiliar, then reading the man page first is a good idea. If things go > wrong, then 'git reflog' will help you recover the values for old branches, > etc. git rebase --abort is your friend if it's going horribly sideways... > > (1) Create a new name for the old main: > % git checkout main > % git checkout -b oldmain > > (2) Now, make main point to the new hashes > % git checkout -B main origin/main > > (3) now, for each of your WIP branches, rebase them (I have -i here, but > that's finger memory). > % git rebase -i oldmain $WIPNAME --onto main > > (4) if you really want, you can now delete oldmain, though I'd keep it > around for a while. > % git branch -D oldmain > > Make sense? Oh, if it does go terribly sideways, and you need to just > reclone into a new directory, you can check out > http://bsdimp.blogspot.com/2020/08/how-to-transport-branch-from-one-git.html > which will show you how to use git format-patch and git am to move the > branches to the new repo. Again, git reflog can help if branch names get > screwed up since that's as close as git gets to keeping meta-data history... > > And please let me know if it works, or if you encounter any issues. > Ah, I read over step 2, and using the --allow-unrelated-histories flag has now created a local main that is 546215 commits ahead of origin/main :( Time to redo that step. René From owner-freebsd-git@freebsd.org Sat Nov 28 23:44:08 2020 Return-Path: Delivered-To: freebsd-git@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id BE36946E794 for ; Sat, 28 Nov 2020 23:44:08 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: from mail-oi1-x233.google.com (mail-oi1-x233.google.com [IPv6:2607:f8b0:4864:20::233]) (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 4Ck7PN4Y2Gz4tsB; Sat, 28 Nov 2020 23:44:08 +0000 (UTC) (envelope-from oliver.pntr@gmail.com) Received: by mail-oi1-x233.google.com with SMTP id j15so10114422oih.4; Sat, 28 Nov 2020 15:44:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=aQzish9XsOx5WaAQ0VwpbGeYutkC7Ng2m/SfbqLoSIE=; b=SwnSeI9vM5HlAZRAZ2fRbCUpQXe19Js23mEtxQLL6YYUE7/GofucGhWhVose48nfDp OE6G6/a+ZFz+Q6wMFmhTXKCn+XazkhwMfPU3zH5fbbiAuYoWVgJrqLorNiNIpzRxRbCs 1NQSZGJA5/n7DQ9INAKKeHI/wNh3rRJCrUseiz5BOImVInv6+ALZdcN1bnhG/9AxWd6w t1vAKdBAp57hU2/dqJD+wv/8/bO96LV9aIxt51RLoWS+mkC6fL81z6bAJTS859B6yxC7 W115ab3hgsN2I2apfT0jUwD1v/4DQTNR/6+BTkcAbVz62abxtT71dOSdlyjYxSSWPfTj 5JXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=aQzish9XsOx5WaAQ0VwpbGeYutkC7Ng2m/SfbqLoSIE=; b=F5117Lhyzz5wskbHH7iXHO1jhPsyNjBcajvZsxi1H76V+VecSNXgXTry+//ejmUBJ1 K2haH+qYYriGhl8f0hEG5Bd3rHCtY2LQw2GXGGmlg1QQfd+AHs2hJPgEY3Hl9bwUBiHm Y+Hgdt8bavXjHCnJY6ksQ+QnroZ7bKrrEgAwgA24AyTq/a3Ta5ok6DrrKp/n1gzHKTXX 8PftnvTzq2rxT6oDkrvwGGTrN2/MMiloEJ4HNcGWeZGkt2EzCcYlbJG53SMFgcMzdVdE Q9WxVi0Jw/YtYE6qcTxadCWl73GVaAhrTqFXLE03BJYYw2gEXU2U6Ne3iKPSbCUpgesR YDWg== X-Gm-Message-State: AOAM530bsFCcDVNeZXMs29ZNutY8GOVujNcYUIxc4xIWZXKX8+Srtab3 zvtF1UwgE4SHpuWx6v7ZeBf4w+x/yZxqizaaKAV1bVzp X-Google-Smtp-Source: ABdhPJxd9DUWOM6qAIizWgb1k3pM2mbpIyVKgPyE7h7iNlUI4gAZq4XTy4Yub8g6fnHcLwcsGKqwFzJILSLaXscWaIk= X-Received: by 2002:aca:a951:: with SMTP id s78mr10520339oie.114.1606607047484; Sat, 28 Nov 2020 15:44:07 -0800 (PST) MIME-Version: 1.0 Received: by 2002:a4a:970e:0:0:0:0:0 with HTTP; Sat, 28 Nov 2020 15:44:06 -0800 (PST) In-Reply-To: References: <20201128165115.GA22587@freefall.freebsd.org> <20201128205528.GA58416@freefall.freebsd.org> From: Oliver Pinter Date: Sun, 29 Nov 2020 00:44:06 +0100 Message-ID: Subject: Re: HEADS UP: freebsd-ports hashes were all changed To: Warner Losh Cc: Rene Ladan , "freebsd-git@freebsd.org" X-Rspamd-Queue-Id: 4Ck7PN4Y2Gz4tsB X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.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: Sat, 28 Nov 2020 23:44:08 -0000 On Saturday, November 28, 2020, Warner Losh wrote: > On Sat, Nov 28, 2020 at 1:55 PM Rene Ladan wrote: > > > On Sat, Nov 28, 2020 at 01:41:02PM -0700, Warner Losh wrote: > > > On Sat, Nov 28, 2020 at 9:51 AM Rene Ladan wrote: > > > > > > > On Sat, Nov 28, 2020 at 12:52:01PM +0100, Ulrich Sp=C3=B6rlein wrot= e: > > > > > On Sat, 2020-11-28 at 12:24:41 +0100, Ulrich Sp=C3=B6rlein wrote: > > > > > >Hi folks, bad news > > > > > > > > > > > >While carving out the history of the access and mentors file (we > > want to > > > > > >retain that for historical analysis, which people seem to do fro= m > > time > > > > > >to time), I overlooked that fact that the previous runs for port= s > > did > > > > > >contain all of CVSROOT, but the new one, by necessity would not > > contain > > > > > >CVSROOT/{access,mentors}, in fact, I dropped the whole CVSROOT > > prefix > > > > > >from the latest rules file. It should never have been there in t= he > > first > > > > > >place. :( > > > > > > > > > > > >All that is to say that this of course means all the git commit > > hashes > > > > > >for the ports tree have changed. Oops. > > > > > > > > > > > >Sorry about that, please let me know if you need help in > > transplanting > > > > > >your work from old hashes to new hashes. > > > > > > > > > The web finds [1] which would translate to > > > > > > > > git merge orgin main --allow-unrelated-histories > > > > > > > > but I'm not sure if this is the correct hammer? > > > > > > > > [1] > > > > > > https://github.com/git/git/blob/master/Documentation/ > RelNotes/2.9.0.txt#L58-L68 > > > > > > > > > > I'm not sure either. What does your tree look like? Is it just tracki= ng > > > upstream? Or do you have changes / branches? > > > > > I have a few local branches for some WIP things that I keep in sync wit= h > > main. > > None of those are pushed obviously. If all else fails I can just reclon= e > > the > > repository and recreate those branches, they are of a temporary nature. > > > > OK. So, at this point, 'main' locally is the old hash, and 'origin/main' = is > the new hash. > > I'd recommend the following. What it does is creates an 'oldmain' branch = to > match the current repo, then recreates the new hash main as 'main' and th= en > rebases all your WIP branches to main with the new hashes. It looks a bit > scary, I'll grant, but I've done similar things a lot. If any is > unfamiliar, then reading the man page first is a good idea. If things go > wrong, then 'git reflog' will help you recover the values for old branche= s, Another trick will be to create tags for the branches. Tags are cheap in git, reflog have a limited history by default AFAIK. > etc. git rebase --abort is your friend if it's going horribly sideways... > > (1) Create a new name for the old main: > % git checkout main > % git checkout -b oldmain > > (2) Now, make main point to the new hashes > % git checkout -B main origin/main > > (3) now, for each of your WIP branches, rebase them (I have -i here, but > that's finger memory). > % git rebase -i oldmain $WIPNAME --onto main > > (4) if you really want, you can now delete oldmain, though I'd keep it > around for a while. > % git branch -D oldmain > > Make sense? Oh, if it does go terribly sideways, and you need to just > reclone into a new directory, you can check out > http://bsdimp.blogspot.com/2020/08/how-to-transport- > branch-from-one-git.html > which will show you how to use git format-patch and git am to move the > branches to the new repo. Again, git reflog can help if branch names get > screwed up since that's as close as git gets to keeping meta-data > history... > > And please let me know if it works, or if you encounter any issues. > > Warner > _______________________________________________ > 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" >