-
Notifications
You must be signed in to change notification settings - Fork 943
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[jog_arm] Move and rename to moveit_ros/moveit_servo #2165
Conversation
Codecov Report
@@ Coverage Diff @@
## master #2165 +/- ##
==========================================
+ Coverage 57.57% 57.95% +0.38%
==========================================
Files 327 327
Lines 25668 25668
==========================================
+ Hits 14778 14876 +98
+ Misses 10890 10792 -98
Continue to review full report at Codecov.
|
5613b73
to
b48460b
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I tested it and did a quick verification that "jog" and "Jog" don't appear anywhere (except message types, which we can't change here). Looks good! Approved if you remove that last commit, like Henning pointed out. |
Just to clarify @henningkayser, you want me to leave the COLCON_IGNORE file here in the ROS1 package? |
No, the commits shouldn't include COLCON_IGNORE at all. This repo doesn't include this file so there should be no need to remove it. |
I think once these commits all get squashed it won't matter, then... |
One of my earlier commits added it (first done in moveit2), and I removed it at the end. I think Andy is right and squashing these commits together would result in it never being here. If we are going to squash before merging anyway, I think leaving it is ok. Otherwise I can fix the commit that added it, and remove the final commit |
b48460b
to
88021dd
Compare
I removed the COLCON_IGNORE from these commits |
The commit history is a good documentation here, I would also keep it probably. |
IMHO we should try to avoid merging PRs like this as a merge-commit and instead squash-merge them. For example, this one has many closely-related commits and some cleanup commits:
...
...
@tylerjw: As I have seen several such commits from your side recently (e.g. also #2103), please carefully balance a clean vs. detailed history in future. Sometimes, of course, it is important and useful to keep individual commits of a PR and perform a proper merge. In these cases, (request to) cleanup the PR commit history before merging. Examples are unrelated commits (e.g. backports) in a single PR. However, as a rule of thumb, our guidelines state that a single PR should only tackle a single "problem" and thus all related commits should be squash-merged by default (see GitHub Merge Policies). |
Thanks for mentioning it, I was close to bringing it up, too. #2162 in particular is very long (54 commits, 15 for renaming, two identical commits one after the other). I would actually support force-pushing a clean version to melodic-devel in this case because it's so large. |
Description
This moves the
moveit_experimental/jog_arm
package and renames itmoveit_ros/moveit_servo
@AndyZe. There is already an open PR for ROS2 (moveit/moveit2#223) with some discussion.@tylerjw will help with migration notes through the name change as well as his big recent PR #2103.
Checklist