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

Fix angular distance calculation in floating joint model (backport #2538) #2544

Merged
merged 2 commits into from
Dec 15, 2023

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 21, 2023

This is an automatic backport of pull request #2538 done by Mergify.
Cherry-pick of 83ff55a has failed:

On branch mergify/bp/iron/pr-2538
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 83ff55a4a.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   moveit_core/robot_model/src/floating_joint_model.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   moveit_core/robot_trajectory/test/test_robot_trajectory.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

(cherry picked from commit 83ff55a)

# Conflicts:
#	moveit_core/robot_trajectory/test/test_robot_trajectory.cpp
@mergify mergify bot added the conflicts label Nov 21, 2023
@sea-bass sea-bass self-assigned this Nov 21, 2023
@sea-bass sea-bass requested a review from tylerjw November 21, 2023 19:18
Copy link

codecov bot commented Nov 21, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (2ee72ae) 50.74% compared to head (5a690f8) 50.71%.

Additional details and impacted files
@@            Coverage Diff             @@
##             iron    #2544      +/-   ##
==========================================
- Coverage   50.74%   50.71%   -0.03%     
==========================================
  Files         386      385       -1     
  Lines       31982    31980       -2     
==========================================
- Hits        16227    16215      -12     
- Misses      15755    15765      +10     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@henningkayser henningkayser merged commit f64b202 into iron Dec 15, 2023
1 of 5 checks passed
@henningkayser henningkayser deleted the mergify/bp/iron/pr-2538 branch December 15, 2023 18:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants