search

jsk-ros-pkg / jsk_robot

jsk-ros-pkg/jsk_robot
https://github.com/jsk-ros-pkg/jsk_robot
73 stars 97 forks source link

[develop/fetch] [jsk_robot_startup] Work around update_workspace #1824

Open mqcmd196 opened 1 year ago

mqcmd196 commented 1 year ago

Background

  1. Untracked files are not stashed
  2. The script assumes that jsk_robot is in src/jsk-ros-pkg/jsk_robot
  3. If you accidentally leave only local commits within the robot body on a branch configured for rosinstall, such as develop/fetch, the changes will disappear.

What has been changed?

  1. git stash -u instead
  2. execute wstool update -t $WORKSPACE/src $(rospack find jsk_robot_startup)/../.. --delete-changed-uris instead of wstool update -t $WORKSPACE/src jsk-ros-pkg/jsk_robot --delete-changed-uris
  3. If some commits in the branch configured for rosinstall were found, the script evacuates those commits to another branch, like develop/fetch-patch-${current date}
mqcmd196 commented 1 year ago

rebased current origin/develop/fetch and checked work correctly

sktometometo commented 1 year ago

@mqcmd196 kindly ping, I would appreciate any comments on the progress of this Pull Request and previous discussions.

mqcmd196 commented 1 year ago

@sktometometo Sorry for late, please check https://github.com/jsk-ros-pkg/jsk_robot/pull/1824/commits/8b5ee7251ed7fc66e37e624a1cd306260af67896

mqcmd196 commented 1 year ago

I have to check on real robot

sktometometo commented 1 year ago

Let's merge and check with a robot.

mqcmd196 commented 1 year ago

After tomorrow, I'll go to the lab and check it.