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 setting of initial state in HW compoments (backport #1046) #1064

Merged
merged 11 commits into from
Jan 22, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 23, 2023

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

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

You are currently cherry-picking commit cf4448d.
  (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:   controller_manager/doc/userdoc.rst
	modified:   controller_manager/test/test_hardware_management_srvs.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   controller_manager/src/controller_manager.cpp
	both modified:   hardware_interface/include/hardware_interface/resource_manager.hpp
	both modified:   hardware_interface/src/resource_manager.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 cf4448d)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
#	hardware_interface/include/hardware_interface/resource_manager.hpp
#	hardware_interface/src/resource_manager.cpp
@bmagyar
Copy link
Member

bmagyar commented Jun 23, 2023

@destogl should we fix this or no backport?

@destogl
Copy link
Member

destogl commented Jun 26, 2023

We should fix this, but first merge #1052

@christophfroehlich
Copy link
Contributor

christophfroehlich commented Dec 10, 2023

needs #1216 first

@christophfroehlich christophfroehlich marked this pull request as draft December 10, 2023 22:02
Copy link
Contributor Author

mergify bot commented Dec 11, 2023

This pull request is in conflict. Could you fix it @mergify[bot]?

controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/src/resource_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/src/resource_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/src/resource_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/src/resource_manager.cpp Outdated Show resolved Hide resolved
hardware_interface/src/resource_manager.cpp Outdated Show resolved Hide resolved
@destogl destogl marked this pull request as ready for review January 12, 2024 17:58
@christophfroehlich
Copy link
Contributor

@destogl I fixed this PR. ABI check fails, but this is only because of the test files? Shouldn't break anything from users?

@destogl destogl merged commit 2d31b1b into humble Jan 22, 2024
11 of 12 checks passed
@destogl destogl deleted the mergify/bp/humble/pr-1046 branch January 22, 2024 14:19
skpawar1305 added a commit to cyberbotics/webots_ros2 that referenced this pull request Feb 20, 2024
skpawar1305 added a commit to cyberbotics/webots_ros2 that referenced this pull request Feb 20, 2024
omichel pushed a commit to cyberbotics/webots_ros2 that referenced this pull request Feb 20, 2024
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