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

Add header to import limits from standard URDF definition (backport #1298) #1417

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 26, 2024

This is an automatic backport of pull request #1298 done by Mergify.
Cherry-pick of f3ffb56 has failed:

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

You are currently cherry-picking commit f3ffb56.
  (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:
	new file:   joint_limits/include/joint_limits/joint_limits_urdf.hpp
	modified:   joint_limits/package.xml
	new file:   joint_limits/test/joint_limits_urdf_test.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   joint_limits/CMakeLists.txt

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 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 f3ffb56)

# Conflicts:
#	joint_limits/CMakeLists.txt
@mergify mergify bot added the conflicts label Feb 26, 2024
@christophfroehlich
Copy link
Contributor

fails because we didn't backport #926 and #1181. Should we? @ros-controls/ros2-maintainers @saikishor?

@saikishor
Copy link
Member

I don't know how backportable #926, if it is backportable, I think it's worth doing. If not, I can create another PR, fixing these conflicts locally.

@bmagyar
Copy link
Member

bmagyar commented Feb 27, 2024

Hmm... I'd even entertain the option of.not backporting this. Are there motivated users?

@christophfroehlich
Copy link
Contributor

christophfroehlich commented Feb 27, 2024

Hmm... I'd even entertain the option of.not backporting this. Are there motivated users?

https://robotics.stackexchange.com/questions/109547/why-my-ros2-control-has-no-fun-joint-limits-urdf-hpp
#1416

@bmagyar
Copy link
Member

bmagyar commented Mar 2, 2024

I think #926 wasn't really backportabke without breaking changes to all the install locations if I remember well... If you guys want to backport the current PR, I'd suggest a manual approach

@destogl
Copy link
Member

destogl commented Mar 4, 2024

This is probably not worth it. It would be better to have master compilable on humble. Much more value.

@christophfroehlich
Copy link
Contributor

This is probably not worth it. It would be better to have master compilable on humble. Much more value.

Almost there ros-controls/ros2_control_ci#30

@christophfroehlich christophfroehlich deleted the mergify/bp/humble/pr-1298 branch March 4, 2024 19:32
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.

4 participants