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 reload after a description with a mimic joint (backport #212) #214

Merged
merged 1 commit into from Jan 5, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 4, 2024

This is an automatic backport of pull request #212 done by Mergify.
Cherry-pick of e72adfc has failed:

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

You are currently cherry-picking commit e72adfc.
  (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:   src/robot_state_publisher.cpp
	new file:   test/change_mimic_joint-launch.py
	new file:   test/mimic_joint.urdf
	new file:   test/test_change_mimic_joint.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CMakeLists.txt

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

* fix mimic_.clear();

* Make the copy explicit.

* Add in a test for the mimic change crash.

Signed-off-by: Chris Lalancette <clalancette@gmail.com>
Co-authored-by: Guillaume Doisy <guillaume@dexory.com>
(cherry picked from commit e72adfc)
@clalancette
Copy link
Contributor

CI:

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

@clalancette clalancette merged commit a3c51c3 into humble Jan 5, 2024
2 checks passed
@clalancette clalancette deleted the mergify/bp/humble/pr-212 branch January 5, 2024 13:42
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

2 participants