Merge 9 -> 11 #615
Merged
Merge 9 -> 11 #615
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gazebosim#575) Now PrintValues() and ToString() will not output the elements that were added by default during parsing. There's also the option to call them with a boolean flag that will allow the caller to decide weather they want defaults in the output or not. Signed-off-by: Marco A. Gutierrez <[email protected]> Co-authored-by: Addisu Z. Taddese <[email protected]>
This moves the recently added data member `explicitlySetInFile` to the end of the `ElementPrivate` class Signed-off-by: Addisu Z. Taddese <[email protected]>
The graph data is private, so expose methods for checking that the graphs are valid. * Add tests showing graph errors Load an sdf::World or sdf::Model instead of an sdf::Root to see the graph errors. Signed-off-by: Steve Peters <[email protected]>
|
There's a new test failure. I haven't done one of these skipped forward ports, it will be interesting to see what the subsequent ones look like. |
I fixed the test in a force push
I locally did a test merge of this branch with |
azeey
approved these changes
Jul 1, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
➡️ Forward port
Port
sdf9tosdf11. Normally I would merge fromsdf10tosdf11after #614, but I wasn't sure if the parameter passing prototype onsdf10is ready to be merged forward to edifice. Meanwhile, there are a lot of conflicts between #601 and #602 that completely disappear after taking several minutes to resolve them all, so I wanted to simplify our lives by getting that conflict resolution out of the way.Branch comparison: sdf11...sdf9
Note to maintainers: Remember to Merge with commit (not squash-merge or rebase)