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 rqt controller manager (backport #1273) #1275

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 8, 2024

This is an automatic backport of pull request #1273 done by Mergify.
Cherry-pick of 2d82de8 has failed:

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

You are currently cherry-picking commit 2d82de8.
  (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/controller_manager/controller_manager_services.py
	both modified:   rqt_controller_manager/rqt_controller_manager/controller_manager.py

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

* add service_timeout to the other service methods
* catch RuntimeErrors when the service is no longer available

(cherry picked from commit 2d82de8)

# Conflicts:
#	controller_manager/controller_manager/controller_manager_services.py
#	rqt_controller_manager/rqt_controller_manager/controller_manager.py
@christophfroehlich
Copy link
Contributor

@saikishor could you please have a look why this fails for humble?

@saikishor
Copy link
Member

@saikishor could you please have a look why this fails for humble?

@christophfroehlich It seems to be due to the conflicts. Shall I open a separate PR for the Humble? That would be easier I guess

@christophfroehlich
Copy link
Contributor

you can open a new PR against humble or a PR against mergify/bp/humble/pr-1273, whatever you prefer.

@bmagyar bmagyar closed this Jan 9, 2024
@mergify mergify bot deleted the mergify/bp/humble/pr-1273 branch January 9, 2024 08:12
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.

3 participants