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

Sort controllers while configuring instead of while activating (backport #1107) #1156

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 4, 2023

This is an automatic backport of pull request #1107 done by Mergify.
Cherry-pick of 863f161 has failed:

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

You are currently cherry-picking commit 863f161.
  (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/test/test_chainable_controller/test_chainable_controller.cpp
	modified:   controller_manager/test/test_controller/test_controller.cpp
	modified:   controller_manager/test/test_controller_manager.cpp
	modified:   controller_manager/test/test_load_controller.cpp

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

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 863f161)

# Conflicts:
#	controller_manager/src/controller_manager.cpp
#	controller_manager/test/test_controller_manager_srvs.cpp
@saikishor
Copy link
Member

Hello @bmagyar,

It seems like the initial controller sorting changes are not backported to Humble. What shall we do?

@bmagyar
Copy link
Member

bmagyar commented Nov 4, 2023 via email

@saikishor
Copy link
Member

We could discuss if you want it... Perhaps the best way is a manual backport in that case, cherry picking the two merged PRs on top of humble

Hello @bmagyar,

I've opened a PR cherry-picking the 2 merged PRs as you mentioned.

Thank you!

@bmagyar
Copy link
Member

bmagyar commented Nov 6, 2023

No, thank you!

@bmagyar bmagyar closed this Nov 6, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-1107 branch November 6, 2023 18:13
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