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

[MockHardware] Use consequently 'mock' instead of 'fake'. (backport #1026) – And deprecate parameters. #1051

Merged
merged 7 commits into from
Jun 7, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 5, 2023

This is an automatic backport of pull request #1026 done by Mergify.
Cherry-pick of 7174a1d has failed:

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

You are currently cherry-picking commit 7174a1d.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   hardware_interface/include/mock_components/generic_system.hpp
	both modified:   hardware_interface/src/mock_components/generic_system.cpp
	both modified:   hardware_interface/test/mock_components/test_generic_system.cpp

no changes added to commit (use "git add" and/or "git commit -a")

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 7174a1d)

# Conflicts:
#	hardware_interface/include/mock_components/generic_system.hpp
#	hardware_interface/src/mock_components/generic_system.cpp
#	hardware_interface/test/mock_components/test_generic_system.cpp
@mergify mergify bot added the conflicts label Jun 5, 2023
@destogl destogl changed the title [MockHardware] Use consequently 'mock' instead of 'fake'. (backport #1026) [MockHardware] Use consequently 'mock' instead of 'fake'. (backport #1026) – And deprecate parameters. Jun 5, 2023
@bmagyar
Copy link
Member

bmagyar commented Jun 7, 2023

Needs more work to compile Sire

@destogl
Copy link
Member

destogl commented Jun 7, 2023

Done!

ABI is breaking but on MockHW plugin so no issues there :)

you may merge!

@destogl destogl merged commit 9d5d524 into humble Jun 7, 2023
@destogl destogl deleted the mergify/bp/humble/pr-1026 branch June 7, 2023 21:02
flochre pushed a commit to flochre/ros2_control that referenced this pull request Jul 5, 2023
…os-controls#1026) – And deprecate parameters. (ros-controls#1051)

* Use consequently 'mock' instead of 'fake'. (ros-controls#1026)

(cherry picked from commit 7174a1d)

# Conflicts:
#	hardware_interface/include/mock_components/generic_system.hpp
#	hardware_interface/src/mock_components/generic_system.cpp
#	hardware_interface/test/mock_components/test_generic_system.cpp

---------

Co-authored-by: Dr. Denis <[email protected]>
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.

2 participants