<@U02KAN6061E>: it looks like the cherry-pick job ...
# developmentw
witty-crayon-22786
05/19/2023, 5:53 PM@bitter-ability-32190: it looks like the cherry-pick job might have picked more than it should have here: https://github.com/pantsbuild/pants/actions/runs/5026777727/jobs/9015456286
b
bitter-ability-32190
05/19/2023, 5:54 PMYeah see my replies here: https://pantsbuild.slack.com/archives/C0D7TNJHL/p1684426647255779
And a crappy attempt at a patch here: https://github.com/pantsbuild/pants/pull/19057
bitter-ability-32190
05/19/2023, 5:54 PMMy SWAG is that without the full depth its doing a 2-way merge, and not a 3-way merge?
I'm really lost and confused. I tried everything locally and it worked, so the only difference I can spot is depth
w
witty-crayon-22786
05/19/2023, 5:55 PMa cherry-pick doesn’t involve a merge, afaik?
b
bitter-ability-32190
05/19/2023, 5:55 PMI mean, we're getting merge conflicts. I think its in the name 🙂
c
curved-television-6568
05/19/2023, 5:56 PMit should be called a change conflict.
w
witty-crayon-22786
05/19/2023, 5:56 PMbut what i mean is that a cherry-pick is never a merge. it’s more like a rebase. so i don’t think depth matters
👍 1
b
bitter-ability-32190
05/19/2023, 5:57 PMWell, feel free to experiment 😛
We do half-day fridays so I'm about to kick it
bitter-ability-32190
05/19/2023, 5:57 PMOtherwise ill maybe try tonight. I think attempts should use a fresh depth: 1 clone of the repo to mimick GHA
w
witty-crayon-22786
05/19/2023, 6:00 PMno worries: have a good weekend!
p
proud-dentist-22844
05/19/2023, 8:58 PMgit still refers to cherry-pick conflicts as merge conflicts
w
witty-crayon-22786
05/19/2023, 9:00 PMyea. the point of my comment was rather that regardless of how it is implemented, nothing other than the picked commit should be relevant (which is unlike a merge, and more like a rebase)
witty-crayon-22786
05/19/2023, 9:01 PMrunning that script with
set -xb
bitter-ability-32190
05/22/2023, 11:49 AMSo some observations:
Cherry pick has merge strategy options. So there might be some amount of "merging"
The error is that both we and the other branch added the same files (seemingly every file in the repo
bitter-ability-32190
05/22/2023, 11:49 AMAlso @happy-kitchen-89482 pile in 😂
bitter-ability-32190
05/22/2023, 11:52 AMI suppose my next attempt will just use
-Xtheirsbitter-ability-32190
05/22/2023, 11:53 AMIt's weird to me that cherry-pick is erroring on files not in the patch though. I thought cherry pick just applied the patch associated for the commit
☝️ 1
w
witty-crayon-22786
05/22/2023, 5:20 PMexactly
b
bitter-ability-32190
05/22/2023, 5:41 PMI'm declaring a bit of bankruptcy at the moment. I'll revisit later 😮💨
bitter-ability-32190
05/22/2023, 8:20 PMDebugging step: https://github.com/pantsbuild/pants/pull/19095
🚢 1
bitter-ability-32190
05/23/2023, 6:29 PMWow, so running this action locally with
actbitter-ability-32190
05/23/2023, 6:45 PMAnnnd manually running it now "works"?!
Failed run: https://github.com/pantsbuild/pants/actions/runs/5060909395
Passed run: https://github.com/pantsbuild/pants/actions/runs/5060928020/jobs/9084453166
same PR number...
😮💨 😡
bitter-ability-32190
05/23/2023, 6:49 PMOh the ONE difference I can think of is that on the passing job, the PR commit wasn't the tip of
mainw
witty-crayon-22786
05/23/2023, 6:52 PMmy hope is that the
set -xgit cherry-pick $SHAb
bitter-ability-32190
05/23/2023, 6:54 PMYeah. That was my one and only thought. "What if the value to
cherry-pick-xbitter-ability-32190
05/23/2023, 6:56 PMGuess we'll need to find something that needs cherry-picking 😉