Cherry-pick missing commits from kinetic-devel into melodic-devel #501
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
Legacy __print__ statements are syntax errors in Python 3 but __print()__ function works as expected in both Python 2 and Python 3.
gavanderhoorn
force-pushed
the
port_kinetic-devel_missing
branch
from
97de361 to
d730bb5
Compare
|
Dropped the MoveIt e-Series commit as this will be fixed later, makes this PR fail and it makes little sense to fix that now just to pass CI. |
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.
As per subject.
This gets
melodic-devel-stagingto the same state (functionally) as currentkinetic-devel.melodic-develwas branched off ofkinetic-develat a point where releases1.2.6and1.2.7hadn't been made yet, so three commits were missing (see the diff).Rebasing
melodic-devel-stagingis not an option as it then cannot be merged withmelodic-devel.PRs 'merged' in this PR:
ur_driverhaving been removed entirely)fix #466: fix loading e-series robot_description param #467 (the MoveIt configurations will be regenerated completely, but this completes their history)