Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure requested class with mode=legendicon is not negative. #6357

Merged
merged 16 commits into from
Jul 2, 2021

Conversation

sdlime
Copy link
Member

@sdlime sdlime commented Jul 2, 2021

No description provided.

@jmckenna jmckenna added the backport branch-7-6 To backport a pull request to branch-7-6 label Jul 2, 2021
@jmckenna
Copy link
Member

jmckenna commented Jul 2, 2021

Thanks Steve, I think we can also backport this to 7-6....(adding label now)

@sdlime
Copy link
Member Author

sdlime commented Jul 2, 2021

Thanks Steve, I think we can also backport this to 7-6....(adding label now)

Definitely, can go back further too if those backport labels work.

@sdlime sdlime merged commit 46fb2a1 into MapServer:main Jul 2, 2021
@sdlime sdlime deleted the legendicon branch July 2, 2021 16:29
@github-actions
Copy link
Contributor

github-actions bot commented Jul 2, 2021

The backport to branch-7-6 failed:

The process '/usr/bin/git' failed with exit code 128

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-branch-7-6 branch-7-6
# Navigate to the new working tree
cd .worktrees/backport-branch-7-6
# Create a new branch
git switch --create backport-6357-to-branch-7-6
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick acb708a4dbeb77645dd085f0564d4a62b8836612,365120ac896bc23c4644e39ea7aac9a98c3cbfb7,e0d1d432181fbcb2e62093053a33096e913ebec1,7d261af86140a491df170ba7054aa9d1aa9f3ad7,7cc1f00a1b920b70467c3015c2dd2bbf4663029d,e59d3cb001b06217f3640a67a5c8835bf8fad5a1,ebb3cd34a85a7b5fe76ccad35bf7443c9b048ac6,a4e68585d9bd912dd3fe0c3e3ac92dd1d32a7a1d,dac5cdc9085c60ca634de508beb2e7d7f8309d92,3111bef631b1a699a52131f9a03c3b3514cb3f02,2fc8d75432bf43c38fe0b3df1d06507f34b4ebca,db9eb79bbc1d2beb0ad8fe3a9d058280372c820a,239aa94cd9ead9e46b062a59ea8764baf58ad794,ffca10987e2be18e834fcb0739338d8bc9f63550,b99e3eaca7079bee45af70a7faa9d3ad86f1ef91,bbe742ffc06ed6dd8550cb9e674d73fc2015b47a
# Push it to GitHub
git push --set-upstream origin backport-6357-to-branch-7-6
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-branch-7-6

Then, create a pull request where the base branch is branch-7-6 and the compare/head branch is backport-6357-to-branch-7-6.

@sdlime sdlime restored the legendicon branch July 6, 2021 18:08
@sdlime
Copy link
Member Author

sdlime commented Jul 6, 2021

Thanks Steve, I think we can also backport this to 7-6....(adding label now)

@jmckenna , the backport failed. Do you know if it's an action issue or something else? The change was minor and should have backported cleanly.

@jmckenna
Copy link
Member

jmckenna commented Jul 6, 2021

@sdlime I'll take a look...

jmckenna pushed a commit that referenced this pull request Jul 6, 2021
* Make sure the requested class index is not negative.
@jmckenna
Copy link
Member

jmckenna commented Jul 6, 2021

cherry-picked manually to the 7-6 branch (0901b57)

@jmckenna
Copy link
Member

jmckenna commented Jul 6, 2021

(I'm not aware of a problem with the GitHub action, it has been working great...anyway one manual cherry-pick is ok)

@sdlime sdlime deleted the legendicon branch October 20, 2021 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport branch-7-6 To backport a pull request to branch-7-6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants