Merged
Conversation
changelog 1.0.0
[melodic] Update version info to 1.0.0
* clang-tidy: performance-faster-string-find * clang-tidy: performance-for-range-copy * clang-tidy: performance-unnecessary-copy-initialization * clang-tidy: clang-tidy: performance-unnecessary-value-param * clang-tidy: modernize-redundant-void-arg * clang-tidy: modernize-use-nullptr * clang-tidy: modernize-use-default * clang-tidy: readability-named-parameter * clang-tidy: readability-redundant-string-cstr * clang-tidy: readability-simplify-boolean-expr * clang-tidy: readability-simplify-boolean-expr (manual fix) * clang-tidy: readability-container-size-empty * clang-tidy: llvm-namespace-comment * clang-format * Keep default values setting for QFlags variable * Further simplify boolean expression
... that were removed in moveit#1341.
... after fkie/catkin_lint#62 has been resolved and catkin_lint 1.5.6 has been released.
* Switch to master branch * Clarify release branch policy
If the main planner fails, res.trajectory_ is NULL, and accessing it segfaults.
Kinematics unit tests use random sampling, which might (randomly) cause the tests to fail (unfortunately sampling many failing samples). This fix reduces randomness by using a fixed seed to sample robot states. Additionally, the "searchIKWithCallback" test should resample dismissed samples as pointed out in moveit/moveit_kinematics_tests#16.
Fcl as a Plugin
* fix uninitialized variables * fix unused variables * remove unnecessary const specifier (returning by value doesn't require a const specifier) * fix initialization order * fix unsigned / signed comparison issues * add suggested parentheses * fix mismatching class/struct declarations * provide default destructor for polymorphic base class * remove unused capture variable * remove unused member variable * Travis: consider more warnings (-Wall -Wextra ...)
Closed
Contributor
|
Thanks @rhaschke and @henningkayser. After merging and applying some changes AcutronicRobotics@4142567, CI passed. @vmayoral approves this PR. |
Member
|
@rhaschke approved. |
henningkayser
approved these changes
Mar 11, 2019
mlautman
approved these changes
Mar 11, 2019
Member
|
I've responded here: |
Contributor
|
Before looking into #47, has anyone cherry-picked AcutronicRobotics@4142567? I'd prefer to avoid redoing this work in the future so let's keep as close as we can to http://github.com/acutronicrobotics/moveit2 |
Merged
Contributor
Author
|
@vmayoral, why don't you open a PR for this? |
Member
|
+1 to opening PR so it can be properly reviewed |
Contributor
|
@rhaschke and @davetcoleman, please review #52 |
JafarAbdi
pushed a commit
to JafarAbdi/moveit2
that referenced
this pull request
Oct 28, 2019
Master sync 30 03 19
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
10 participants
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.
Replacement for #35, which has a weird commit history (using two merge commits). This one is cleaner and already includes some of the most recent merges in MoveIt 1. All conflicts are resolved the same way Henning did in #35 - thanks for preparing this.
In contrast to the merge-strategy suggested in #26 (comment), I propose the following for the future:
If approved, such a sync PR should be "merged" manually using
fast-forward. github's web interface doesn't provide such an option!Using github's merge commit, will create another, superfluous commit and squashing or rebasing doesn't make sense at all.
However, looks like @davetcoleman has forbidden to push to the MoveIt 2 repo from cmdline. This is a typical use case, where interaction from cmdline is desirable 😉
When there are no merge conflicts, the following procedure using github's web interface will work too:
Subsequently, file a PR for the created
melodic-syncbranch and merge using a standard merge-commit.