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 multiple chainable controller activation bug (backport #1401) #1412

Merged
merged 4 commits into from
Mar 2, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 22, 2024

This is an automatic backport of pull request #1401 done by Mergify.
Cherry-pick of 1cc73c2 has failed:

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

You are currently cherry-picking commit 1cc73c2.
  (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:   controller_manager/src/controller_manager.cpp
	both modified:   controller_manager/test/test_controller_manager_srvs.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/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 1cc73c2)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
#	controller_manager/test/test_controller_manager_srvs.cpp
@mergify mergify bot added the conflicts label Feb 22, 2024
Copy link
Member

@saikishor saikishor left a comment

Choose a reason for hiding this comment

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

I believe, the following should fix here as well

controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/src/controller_manager.cpp Outdated Show resolved Hide resolved
controller_manager/test/test_controller_manager_srvs.cpp Outdated Show resolved Hide resolved
controller_manager/test/test_controller_manager_srvs.cpp Outdated Show resolved Hide resolved
Co-authored-by: Sai Kishor Kothakota <[email protected]>
bmagyar
bmagyar previously approved these changes Mar 2, 2024
Copy link

codecov bot commented Mar 2, 2024

Codecov Report

Attention: Patch coverage is 80.00000% with 1 lines in your changes are missing coverage. Please review.

Project coverage is 75.52%. Comparing base (4415018) to head (9244b5d).

Additional details and impacted files
@@           Coverage Diff           @@
##             iron    #1412   +/-   ##
=======================================
  Coverage   75.51%   75.52%           
=======================================
  Files          42       42           
  Lines        3366     3371    +5     
  Branches     1939     1943    +4     
=======================================
+ Hits         2542     2546    +4     
- Misses        440      441    +1     
  Partials      384      384           
Flag Coverage Δ
unittests 75.52% <80.00%> (+<0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Coverage Δ
controller_manager/src/controller_manager.cpp 68.46% <80.00%> (+0.05%) ⬆️

@bmagyar bmagyar merged commit da361c8 into iron Mar 2, 2024
12 checks passed
@bmagyar bmagyar deleted the mergify/bp/iron/pr-1401 branch March 2, 2024 17:33
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