From 3f31f061d5d930d30f9be6fbe43c4ef6f6ec5a8e Mon Sep 17 00:00:00 2001 From: Antonio Cuadros <49162117+Acuadros95@users.noreply.github.com> Date: Fri, 21 Jul 2023 11:58:52 +0200 Subject: [PATCH 1/2] Remove micro-ROS fork (#655) * Remove micro-ROS fork Signed-off-by: acuadros95 * Modify repos folder Signed-off-by: acuadros95 * Rever change Signed-off-by: acuadros95 --------- Signed-off-by: acuadros95 (cherry picked from commit a20c5dcb815110470a24fe9061f526243e94b5fc) # Conflicts: # config/client_uros_packages.repos --- config/client_ros2_packages.txt | 1 + config/client_uros_packages.repos | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/config/client_ros2_packages.txt b/config/client_ros2_packages.txt index e86b75cc..7ccb6697 100644 --- a/config/client_ros2_packages.txt +++ b/config/client_ros2_packages.txt @@ -15,3 +15,4 @@ keep: ros2/rcpputils ros2/rosidl_core ros2/ros2_tracing + ros2/rosidl_dynamic_typesupport \ No newline at end of file diff --git a/config/client_uros_packages.repos b/config/client_uros_packages.repos index 348238a1..5ed6b9c0 100644 --- a/config/client_uros_packages.repos +++ b/config/client_uros_packages.repos @@ -40,8 +40,12 @@ repositories: uros/rosidl_typesupport_microxrcedds: type: git url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git +<<<<<<< HEAD version: iron uros/rosidl_dynamic_typesupport: type: git url: https://github.com/micro-ROS/rosidl_dynamic_typesupport.git version: iron +======= + version: rolling +>>>>>>> a20c5dc (Remove micro-ROS fork (#655)) From 1b24c0b82b63b7162651272c010c972aeae4f13d Mon Sep 17 00:00:00 2001 From: acuadros95 Date: Mon, 24 Jul 2023 14:18:18 +0200 Subject: [PATCH 2/2] Fix backport Signed-off-by: acuadros95 --- config/client_uros_packages.repos | 8 -------- 1 file changed, 8 deletions(-) diff --git a/config/client_uros_packages.repos b/config/client_uros_packages.repos index 5ed6b9c0..beb5de2f 100644 --- a/config/client_uros_packages.repos +++ b/config/client_uros_packages.repos @@ -40,12 +40,4 @@ repositories: uros/rosidl_typesupport_microxrcedds: type: git url: https://github.com/micro-ROS/rosidl_typesupport_microxrcedds.git -<<<<<<< HEAD version: iron - uros/rosidl_dynamic_typesupport: - type: git - url: https://github.com/micro-ROS/rosidl_dynamic_typesupport.git - version: iron -======= - version: rolling ->>>>>>> a20c5dc (Remove micro-ROS fork (#655))