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

World: handle name collisions like Model #1311

Merged
merged 5 commits into from
Aug 22, 2023

Conversation

scpeters
Copy link
Member

🦟 Bug fix

Follow-up to #1293 (comment)

Summary

Checklist

  • Signed all commits for DCO
  • Added tests
  • Updated documentation (as needed)
  • Updated migration guide (as needed)
  • Consider updating Python bindings (if the library has them)
  • codecheck passed (See contributing)
  • All tests passed (See test coverage)
  • While waiting for a review on your PR, please help review another open pull request to support the maintainers

Note to maintainers: Remember to use Squash-Merge and edit the commit message to match the pull request summary while retaining Signed-off-by messages.

@github-actions github-actions bot added the 🌱 garden Ignition Garden label Aug 21, 2023
@azeey azeey added the beta Targeting beta release of upcoming collection label Aug 21, 2023
@scpeters scpeters force-pushed the scpeters/world_frame_name_errors branch from 1c92d4f to 114120d Compare August 21, 2023 23:18
ss << "Frame with name [" << frame.Name() << "] "
<< "in world with name [" << this->Name() << "] "
<< "has a name collision, changing frame name to ["
<< frameName << "].";
Copy link
Member Author

@scpeters scpeters Aug 21, 2023

Choose a reason for hiding this comment

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

in the diff without whitespace, you can see that the '\n' is removed on this line

see also #1312

I can revert this if desired

@scpeters
Copy link
Member Author

this is a behavior change, so we could consider targeting main

@codecov
Copy link

codecov bot commented Aug 21, 2023

Codecov Report

Merging #1311 (50a7d9c) into main (af88891) will increase coverage by 0.04%.
The diff coverage is 94.44%.

❗ Current head 50a7d9c differs from pull request most recent head 75bb465. Consider uploading reports for the commit 75bb465 to get more accurate results

@@            Coverage Diff             @@
##             main    #1311      +/-   ##
==========================================
+ Coverage   87.60%   87.64%   +0.04%     
==========================================
  Files         128      128              
  Lines       16830    16837       +7     
==========================================
+ Hits        14744    14757      +13     
+ Misses       2086     2080       -6     
Files Changed Coverage Δ
src/World.cc 96.00% <94.44%> (+0.05%) ⬆️

... and 1 file with indirect coverage changes

@scpeters scpeters marked this pull request as ready for review August 22, 2023 00:46
@scpeters scpeters requested a review from azeey as a code owner August 22, 2023 00:46
@azeey
Copy link
Collaborator

azeey commented Aug 22, 2023

this is a behavior change, so we could consider targeting main

It's probably best if we target main

@scpeters scpeters changed the base branch from sdf13 to main August 22, 2023 03:22
@scpeters scpeters added 🎵 harmonic Gazebo Harmonic and removed 🌱 garden Ignition Garden labels Aug 22, 2023
Signed-off-by: Steve Peters <scpeters@openrobotics.org>

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
This is a behavior change.

Signed-off-by: Steve Peters <scpeters@openrobotics.org>
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters scpeters force-pushed the scpeters/world_frame_name_errors branch from c652521 to 756e15b Compare August 22, 2023 03:40
Signed-off-by: Steve Peters <scpeters@openrobotics.org>
@scpeters
Copy link
Member Author

this is a behavior change, so we could consider targeting main

It's probably best if we target main

I rebased on main and updated the Migration guide in 75bb465

@scpeters scpeters merged commit 88e343b into main Aug 22, 2023
@scpeters scpeters deleted the scpeters/world_frame_name_errors branch August 22, 2023 16:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta Targeting beta release of upcoming collection 🎵 harmonic Gazebo Harmonic
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

2 participants