Merge sdf 1.7 changes forward to 1.8 #570
Merged
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
* add double sided material param * added to sdf 1.7 in gazebosim#410 Signed-off-by: Ian Chen <ichen@osrfoundation.org> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* added to sdf 1.7 in gazebosim#435 Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* originally added to 1.7 in gazebosim#429 Signed-off-by: Ian Chen <ichen@osrfoundation.org> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* added to 1.7 spec in gazebosim#446 Signed-off-by: ahcorde <ahcorde@gmail.com> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* added to sdf 1.7 in gazebosim#487 Signed-off-by: Ian Chen <ichen@osrfoundation.org> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* added to sdf 1.7 in gazebosim#514 Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
* added to sdf 1.7 in gazebosim#521 Signed-off-by: Martin Pecka <peckama2@fel.cvut.cz> Signed-off-by: Steve Peters <scpeters@openrobotics.org>
|
I created #571 to track the meta-problem of remembering to copy these changes to the next folder when merging forward. |
azeey
approved these changes
May 18, 2021
There was a problem hiding this comment.
Thanks for noticing @scpeters. I believe there's a small change in frame.sdf that was added in #316, otherwise, LGTM!
Here's a git incantation that lists the changes to sdf/1.7 since sdf/1.8 was created
git diff 11bcc70d00fb55f0b53d5a8daceab340c78cc117..HEAD sdf/1.7 > 1_7_changes.patch
That can be applied to sdf/1.8 with
patch -d sdf/1.8 -N --merge -p3 < 1_7_changes.patch
This may not always work, but at least it narrows down the number of files to look at.
* added to sdf 1.7 in gazebosim#316 Signed-off-by: Steve Peters <scpeters@openrobotics.org>
jennuine
approved these changes
May 19, 2021
|
Thanks! |
aaronchongth
added a commit
that referenced
this pull request
Jun 2, 2021
Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
aaronchongth
added a commit
that referenced
this pull request
Jun 11, 2021
* Copy spec 1.8 to 1.9 Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Merging in changes from #570 Signed-off-by: Aaron Chong <aaronchongth@gmail.com> * Fixing version in root Signed-off-by: Aaron Chong <aaronchongth@gmail.com>
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.
🦟 Bug fix
I noticed that several changes to the
sdf/1.7folder on thesdf10branch were merged forward tosdf11'ssdf/1.7folder but not also copied to thesdf/1.8folder. This manually ports SDFormat 1.7 changes in already insdf11forward to SDFormat 1.8Summary
Changes to the
sdf/1.7folder were introduced to thesdf9andsdf10branches in the following pull requests:They haven't yet been propagated forward to the
sdf/1.8folder, so that's what I've done here. I usedmeld sdf/1.7 sdf/1.8to manually identify the changes that should be propagated forward.Checklist
sh tools/code_check.sh)test coverage)
another open pull request
to support the maintainers
Note to maintainers: Remember to use Squash-Merge