-
Notifications
You must be signed in to change notification settings - Fork 155
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
ros2 branch was cleaned up and force-pushed #540
Comments
Force pushing to a major branch and rewriting history is not ideal for repos that have a significant number of users such as this one. Especially when (not hypothetically) people may depend on specific commit hashes for their work. IMO it would have been preferable to do a "normal" pull request with your intended improvements/cleanups and tag the authors of the disputed PRs for review so that they can learn from your feedback. Additionally to the logistics of having to do hard resets locally, and having to re-test things on our side, it seems like a healthier way to interact with other maintainers rather than saying "your code was so bad that I'm replacing it and deleting it in 2 weeks, good luck". |
Also unrelated to my personal opinion, I just ran the regular MTC tutorial on MoveIt2 with Rolling:
On the
It's planning for a long time and unable to find plans that meet the complete goal...
Seems related to this newly created issue: moveit/moveit2_tutorials#881 So it seems that some key functionality to get this working with MoveIt 2 main has been missed in this transition. Any ideas? |
I share Sebastian's opinion regarding force pushing changes on the ros2 branch. Do you mind reverting that and opening a clean-up PR to review your changes properly? Regarding your comment:
I think this statement is very dismissive of a lot of peoples work. All of the contributions to the ros2 branch are from individuals who value high code quality and want to improve MTC and not "from PickNik". None of these changes were pushed onto the ros2 branch from PickNik but a PR was opened and the changes underwent a proper review process. I think all of the PRs with major changes have been open for at least one 1 week for other maintainers to review. |
Regarding the failing pick+place demo. Looks like you have more sloppy goal constraints in ROS2 by default. |
Oh, awesome, thank you! Will take a look at that. |
I'll just comment (from vacation) that I certainly see both sides of this
issue. There have been some indications recently that MoveIt PRs are not
getting reviewed as well as they used to, and that's not surprising with
all the staff turnover at PickNik. For example, I saw on Robotics Stack
Exchange that MSA is broken (apparently).
Suggest a 2-week waiting period before merging MRs. 1 week sometimes isn't
enough for people like myself (not with PickNik) to review.
…On Mon, Mar 11, 2024, 6:49 AM Sebastian Jahr ***@***.***> wrote:
I share Sebastian's opinion regarding force pushing changes on the ros2
branch. Do you mind reverting that and opening a clean-up PR to review your
changes properly? Regarding your comment:
I went through all commits pushed onto the branch in recent months from
PickNik's side and cleaned them up to the standards of this repo.
I think this statement is very dismissive of a lot of peoples work. All of
the contributions to the ros2 branch are from individuals who value high
code quality and want to improve MTC and not from "PickNik". None of these
changes were pushed onto the ros2 branch from PickNik but a PR was opened
and the changes underwent a proper review process. I think all of the PRs
with major changes have been open for at least one 1 week for other
maintainers to review.
—
Reply to this email directly, view it on GitHub
<#540 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/ACWC7KO7LBTQD6T6LEYXCI3YXWR7BAVCNFSM6AAAAABEO3G6ZKVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMYTSOBYGM3DMNZTGU>
.
You are receiving this because you are subscribed to this thread.Message
ID: ***@***.***
com>
|
I think force pushing to an actively used branch is really a no-go. And this has not been the first time where active dependencies that we maintain and share ownership are being changed or removed under us. We are happy to discuss any quality issues and collaborate by following standards, but in this case it seems like they are arbitrarily self-imposed and not documented anywhere. |
To clarify: my major goal was to cleanup the history of the ros2 branch, backporting some commits to the master branch and then performing a merge-commit to integrate those (and all other improvements on master) into the ros2 branch. This can only be achieved with a force-push. I explicitly kept Probably due to your "sloppy" review process, there were several fixup commits, which should have been ideally handled as part of the reviews. I squashed those into their main commit. I also found 1-2 newly introduced bugs, which I fixed. @sea-bass, if you want to learn from my fixup commits, check out the Regarding the standards not maintained by some commits: There were some commits not following basic formatting standards, which should be actually imposed by CI. I'm not sure how these slipped through, but it happened - multiple times! This was also not noticed during the review process! At some point, we had a policy for MoveIt1 that we need reviews from two people from independent organizations. This rule was clearly violated for most of the commits (if not all), because the PR, reviews, and the final merge were all performed by PickNik people. I still see the main responsibility for this repository with Michael and me. In regard of this responsibility I want to avoid a major divergence between the master and ros2 branches. |
Regarding functionality: With the
As I face similar issues with the Edit: This issue is a duplicate of moveit/moveit2_tutorials#881, which is resolved by moveit/moveit_resources#198. |
I couldn't find that in moveit's maintainer policy. Where does this come from? Also I am wondering what this statement implies:
Does moveit's maintainer policy in your opinion fully apply to this repository and all maintainers are considered equal? In general I think we should discuss these issues regarding the review process and the maintainer policy in the next maintainer meeting to ensure we have a healthy and sustainable way to cooperate. @rhaschke are you available to join? |
When is the next maintainer meeting scheduled? |
March 28, you find the meeting link in the discourse announcement https://discourse.ros.org/t/manipulation-wg-moveit-maintainer-meeting-march-28/36404. |
Hi,friend,Is there a solution to this problem now. I am currently troubled by this issue.Hope your reply,thank you~ |
@yangming517: check #542 and moveit/moveit_resources#198 for a workaround for these issues |
I have update my local workspaces, resetting my local ros2 branch: git remote update; git reset --hard origin/ros2. |
Please describe more precisely, what you did, @yangming517. I suggested to use both of the mentioned PRs. Did you do that? What exactly is the remaining error message? The statement "It doesn't work" is not very helpful in determining a cause. |
@rhaschke sorry for my vague explanation. Is there anything I missed? If you could point it out, I would greatly appreciate it. |
@yangming517, you didn't yet pull #542. In your moveit_task_constructor folder do the following:
After this, your commit SHA should be b40e932. |
@rhaschke hello Regarding my question, it seems that the key should be the modification of this code |
I cannot join on March 28th, unfortunately. |
I went through all commits pushed onto the
ros2
branch in recent months from PickNik's side and cleaned them up to the standards of this repo.Many of them I moved to the
master
branch and eventually merged them back into the ros2 branch.Using merging instead of cherry-picking, one can more easily see which commits are on which branch.
Attention: I force-pushed the ros2 branch to the new, cleaned version.
Please update your local workspaces, resetting your local
ros2
branch:git remote update; git reset --hard origin/ros2
.Only a few commits, whose value I still consider questionable, are left on the ros2 branch. These include:
Some others are ros2-specific, for example:
For now, I kept the old ros2 branch with name
ros2-old
. I will delete this branch in a few weeks.The new branch should™ include all functionality of the old one as well as all improvements from the master branch.
See here for all differences. To highlight my changes even more, I created a cleanup branch, where individual changes can be seen more easily.
In the new ros2 branch, those cleanups are squash-merged into the corresponding main commits, though.
Comparing PickNik's ros2 branch with the old ros2 branch, apart from many missing commits, I noticed larger deviations in
ExecuteTaskSolutionCapability
. So far, I don't understand, why you, @henningkayser, refactored this code so much. In any case, I think you should consider switching to the newros2
branch.The text was updated successfully, but these errors were encountered: