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 tf2_echo does not work with ros-args (#407) (backport #408) #411

Merged
merged 1 commit into from May 20, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented May 3, 2021

This is an automatic backport of pull request #408 done by Mergify.
Cherry-pick of 4d9745e has failed:

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

You are currently cherry-picking commit 4d9745e0.
  (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:   tf2_ros/src/tf2_echo.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://help.github.com/articles/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.io/

* Fix tf_echo does not work with ros-args (#407)

Co-authored-by: Chris Lalancette <clalancette@openrobotics.org>
(cherry picked from commit 4d9745e)

# Conflicts:
#	tf2_ros/src/tf2_echo.cpp
Copy link
Contributor

@clalancette clalancette left a comment

Choose a reason for hiding this comment

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

I've fixed the conflicts here, and this seems good to me. I'd appreciate a second review from @ahcorde while I run CI.

@clalancette
Copy link
Contributor

clalancette commented May 3, 2021

CI:

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@clalancette
Copy link
Contributor

The warnings on Windows have nothing to do with this PR. So I think this is good to go except for a second review.

@clalancette clalancette self-assigned this May 20, 2021
@clalancette clalancette requested a review from ahcorde May 20, 2021 13:22
@clalancette clalancette merged commit 5f30fe8 into foxy May 20, 2021
@delete-merged-branch delete-merged-branch bot deleted the mergify/bp/foxy/pr-408 branch May 20, 2021 14:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants