Skip to content

Commit

Permalink
Update the cherry pick comments
Browse files Browse the repository at this point in the history
  • Loading branch information
jmcarcell committed May 18, 2024
1 parent 19df4c6 commit ce50d74
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .cherry-pick
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ git cherry-pick 6b02e009664c6effb581023982dcb7863da5fb88 -X theirs --no-commit
# gaudi: Add v38.1, remove!
git cherry-pick 64df3df040c71ce2f31f718df1afb373bcf68368 -X theirs --no-commit

# pythia8: Add fix for 8.311, remove when https://github.com/spack/spack/pull/43803 is merged
# pythia8: Add fix for 8.311, remove!
curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/43803.diff | patch -p1

# fastjet: Add a cxxstd variant, remove!
curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44072.diff | patch -p1

# pythia8: Add a cxxstd, remove when https://github.com/spack/spack/pull/44077 is merged
# pythia8: Add a cxxstd, remove!
curl -s https://patch-diff.githubusercontent.com/raw/spack/spack/pull/44077.diff | patch -p1

# fix issues when reconcretizing a GitVersion? remove when https://github.com/spack/spack/pull/43859 is merged
Expand Down

0 comments on commit ce50d74

Please sign in to comment.