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

Enable Twist interpolator (backport #646) #684

Merged
merged 5 commits into from
Aug 30, 2024
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 20, 2024

Related with this issue #643


This is an automatic backport of pull request #646 done by Mergify.

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Co-authored-by: Tully Foote <[email protected]>
(cherry picked from commit 62322b8)

# Conflicts:
#	tf2/include/tf2/buffer_core.h
#	tf2_ros/test/test_buffer.cpp
@mergify mergify bot added the conflicts label May 20, 2024
Copy link
Contributor Author

mergify bot commented May 20, 2024

Cherry-pick of 62322b8 has failed:

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

You are currently cherry-picking commit 62322b8f.
  (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:   tf2/src/buffer_core.cpp
	modified:   tf2_geometry_msgs/include/tf2_geometry_msgs/tf2_geometry_msgs.hpp
	modified:   tf2_geometry_msgs/test/test_tf2_geometry_msgs.cpp
	modified:   tf2_py/src/tf2_py.cpp
	modified:   tf2_py/test/test_buffer_core.py
	modified:   tf2_ros/CMakeLists.txt
	new file:   tf2_ros/test/velocity_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   tf2/include/tf2/buffer_core.h
	both modified:   tf2_ros/test/test_buffer.cpp

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

@mergify mergify bot mentioned this pull request May 20, 2024
Signed-off-by: Alejandro Hernández Cordero <[email protected]>
Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde
Copy link
Contributor

ahcorde commented May 21, 2024

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde
Copy link
Contributor

ahcorde commented May 21, 2024

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Windows Build Status

@ahcorde
Copy link
Contributor

ahcorde commented Aug 20, 2024

@ros-pull-request-builder retest this please

Signed-off-by: Alejandro Hernández Cordero <[email protected]>
@ahcorde
Copy link
Contributor

ahcorde commented Aug 30, 2024

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@ahcorde
Copy link
Contributor

ahcorde commented Aug 30, 2024

warning on RHEL is unrelated

@ahcorde ahcorde merged commit 53793b4 into humble Aug 30, 2024
2 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-646 branch August 30, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant