[ros-users] accidental commit to electric.rosdistro wrt care-o-bot

Peter Soetens peter at thesourceworks.com
Tue Nov 8 15:32:17 UTC 2011


I don't know what happened, but during my release of the
rtt_ros_integration stack, it asked to commit this changeset:

 svn diff -c 18637 electric.rosdistro
Index: electric.rosdistro
===================================================================
--- electric.rosdistro  (revision 18636)
+++ electric.rosdistro  (revision 18637)
@@ -227,8 +227,6 @@
   cob_scenarios: {_rules: cob, version: 0.0.0}
   cob_simulation: {_rules: cob, version: 0.3.1}
   cob_web: {_rules: cob, version: 0.0.0}
-  schunk_modular_robotics: {_rules: cob, version: 0.0.0}
-  schunk_robots: {_rules: cob, version: 0.0.0}
   common:
     _rules:
       hg: {dev-branch: default, distro-tag: $RELEASE_NAME,
release-tag: $STACK_NAME-$STACK_VERSION,
@@ -705,11 +703,13 @@
         dev-branch: master, distro-tag: $RELEASE_NAME, release-tag:
$STACK_NAME-$STACK_VERSION,
         uri: 'git at git.mech.kuleuven.be:robotics/rtt_ros_integration.git'}
       repo: kul-ros-pkg
-    version: 0.5.0.6
+    version: 0.5.0.7
   rx: {_rules: ros-trunk, version: 1.6.1}
   sbpl_arm_planning: {_rules: penn-ros-pkg, version: null}
   sbpl_dynamic_env: {_rules: penn-ros-pkg, version: null}
   scan_tools: {_rules: ccny-ros-pkg-split, version: 1.1.0}
+  schunk_modular_robotics: {_rules: cob, version: 0.0.0}
+  schunk_robots: {_rules: cob, version: 0.0.0}
   shadow_robot:
     _rules:
       bzr: {anon-uri: 'lp:sr-ros-interface', dev-branch: stable,
distro-tag: $RELEASE_NAME,
@@ -863,7 +863,8 @@
     stacks: [wg_common, wg_pr2_apps, pr2_web_apps]
 - care-o-bot-robot:
     extends: [robot, perception, move-arm]
-    stacks: [cob_robots, cob_navigation, cob_manipulation,
cob_object_perception, cob_people_perception,
cob_environment_perception, cob_scenarios]
+    stacks: [cob_robots, cob_navigation, cob_manipulation,
cob_object_perception,
+      cob_people_perception, cob_environment_perception, cob_scenarios]
 - care-o-bot-desktop:
     extends: [care-o-bot-robot]
     stacks: [cob_simulation]

And I hit 'y' too soon to realize something was fishy. Somehow the
lines for care-o-bot changed too,
which I don't maintain/touch.
Should I revert the patch and then re-commit with only the version
update of rtt_ros_integration ?

Or is something else going on ?

Peter



More information about the ros-users mailing list