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
|
I reviewed the changes and they don't seem to modify any of the ROS2 progress so +1 there.
|
|
We have GitHub Merge Policies and I don't claim to be an expert but basically @v4hn says merging is fine sometimes.
Will this break the synchronization with acutronic/moveit2? |
|
Definitely, please use merge commits! Using cherry-picks, it becomes terribly hard to really keep track of all changes. With merge commits, you can immediately recognize which commits are missing.
@henningkayser, I don't get why you have two merge commits here (in both directions). Did you use github to resolve conflicts? I can try later to do a cleaner merge. |
|
Closing in favor of #36. |
Yes I used Github to resolve conflicts which added the first commit and then merged the PR which added the second one. |
There are some more commits to sync this time.
@davetcoleman I followed your instructions from here and used a merge commit for syncing my master-branch. There were some simple conflicts so that Github added two merge commits. Should I squash those?
Alternatively we could use
rebase --ontoso we don't have extra merge commits but potentially altered history.