Fix the CHANGELOGs

Signed-off-by: Emerson Knapp <[email protected]>
mitsudome-r · Feb 17, 2021 · 6007920 · 6007920
1 parent 2ab6da4
commit 6007920
Show file tree

Hide file tree

Showing 13 changed files with 185 additions and 323 deletions.
diff --git a/ros2bag/CHANGELOG.rst b/ros2bag/CHANGELOG.rst
@@ -2,32 +2,6 @@
 Changelog for package ros2bag
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-0.3.6 (2021-01-05)
-------------------
-* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
-* Contributors: Michael Jeronimo
-
-0.3.5 (2020-08-31)
-------------------
-* Add pytest.ini so local tests don't display warning. (`#446 <https://github.com/ros2/rosbag2/issues/446>`_) (`#514 <https://github.com/ros2/rosbag2/issues/514>`_)
-* Contributors: Emerson Knapp
-
-0.3.4 (2020-08-05)
-------------------
-* Validate QoS profile values are not negative. (`#483 <https://github.com/ros2/rosbag2/issues/483>`_) (`#490 <https://github.com/ros2/rosbag2/issues/490>`_)
-  Co-authored-by: Jesse Ikawa <[email protected]>
-* Contributors: Devin Bonnie
-
-0.3.3 (2020-06-23)
-------------------
-=======
-Forthcoming
------------
-=======
-=======
 0.6.0 (2021-02-01)
 ------------------
 * Recorder --regex and --exclude options (`#604 <https://github.com/ros2/rosbag2/issues/604>`_)
@@ -37,10 +11,8 @@ Forthcoming
 * Compress bag files in separate threads (`#506 <https://github.com/ros2/rosbag2/issues/506>`_)
 * Contributors: Adam Dąbrowski, Barry Xu, Emerson Knapp, P. J. Reed
 
->>>>>>> Prepare bloom release 0.6.0 (#628)
 0.5.0 (2020-12-02)
 ------------------
->>>>>>> 0.5.0
 * Sqlite storage double buffering (`#546 <https://github.com/ros2/rosbag2/issues/546>`_)
   * Double buffers
   * Circular queue and FLUSH option as define
@@ -89,7 +61,6 @@ Forthcoming
   * added minor comment
   Co-authored-by: Piotr Jaroszek <[email protected]>
 * Contributors: Adam Dąbrowski
->>>>>>> Changelog.
 
 0.4.0 (2020-11-19)
 ------------------
@@ -116,6 +87,25 @@ Forthcoming
 * Add pytest.ini so local tests don't display warning (`#446 <https://github.com/ros2/rosbag2/issues/446>`_)
 * Contributors: Adam Dąbrowski, Barry Xu, Chris Lalancette, Dirk Thomas, Ivan Santiago Paunovic, Jacob Perron, Jaison Titus, Jesse Ikawa, Karsten Knese, Marwan Taher, Michael Jeronimo, P. J. Reed, jhdcs
 
+0.3.6 (2021-01-05)
+------------------
+* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
+* Contributors: Michael Jeronimo
+
+0.3.5 (2020-08-31)
+------------------
+* Add pytest.ini so local tests don't display warning. (`#446 <https://github.com/ros2/rosbag2/issues/446>`_) (`#514 <https://github.com/ros2/rosbag2/issues/514>`_)
+* Contributors: Emerson Knapp
+
+0.3.4 (2020-08-05)
+------------------
+* Validate QoS profile values are not negative. (`#483 <https://github.com/ros2/rosbag2/issues/483>`_) (`#490 <https://github.com/ros2/rosbag2/issues/490>`_)
+  Co-authored-by: Jesse Ikawa <[email protected]>
+* Contributors: Devin Bonnie
+
+0.3.3 (2020-06-23)
+------------------
+
 0.3.2 (2020-06-03)
 ------------------
 * Improve help message for CLI verbs (`#427 <https://github.com/ros2/rosbag2/issues/427>`_)

diff --git a/rosbag2/CHANGELOG.rst b/rosbag2/CHANGELOG.rst
@@ -2,35 +2,11 @@
 Changelog for package rosbag2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-0.3.6 (2021-01-05)
-------------------
-* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
-* Contributors: Michael Jeronimo
-
-0.3.5 (2020-08-31)
-------------------
-
-0.3.4 (2020-08-05)
-------------------
-
-0.3.3 (2020-06-23)
-------------------
-=======
-Forthcoming
------------
->>>>>>> Changelog.
-=======
-=======
 0.6.0 (2021-02-01)
 ------------------
 
->>>>>>> Prepare bloom release 0.6.0 (#628)
 0.5.0 (2020-12-02)
 ------------------
->>>>>>> 0.5.0
 
 0.4.0 (2020-11-19)
 ------------------
@@ -40,6 +16,20 @@ Forthcoming
 * rosbag2_py reader and writer (`#308 <https://github.com/ros2/rosbag2/issues/308>`_)
 * Contributors: Karsten Knese, Mabel Zhang, Michael Jeronimo
 
+0.3.6 (2021-01-05)
+------------------
+* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
+* Contributors: Michael Jeronimo
+
+0.3.5 (2020-08-31)
+------------------
+
+0.3.4 (2020-08-05)
+------------------
+
+0.3.3 (2020-06-23)
+------------------
+
 0.3.2 (2020-06-03)
 ------------------
 

diff --git a/rosbag2_compression/CHANGELOG.rst b/rosbag2_compression/CHANGELOG.rst
@@ -2,29 +2,6 @@
 Changelog for package rosbag2_compression
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-0.3.6 (2021-01-05)
-------------------
-* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
-* Contributors: Michael Jeronimo
-
-0.3.5 (2020-08-31)
-------------------
-
-0.3.4 (2020-08-05)
-------------------
-* Fix exception thrown given invalid arguments with compression enabled (`#488 <https://github.com/ros2/rosbag2/issues/488>`_) (`#489 <https://github.com/ros2/rosbag2/issues/489>`_)
-* Contributors: Devin Bonnie
-
-0.3.3 (2020-06-23)
-------------------
-=======
-Forthcoming
------------
-=======
-=======
 0.6.0 (2021-02-01)
 ------------------
 * Make compressor implementations into a plugin via pluginlib (`#624 <https://github.com/ros2/rosbag2/issues/624>`_)
@@ -36,13 +13,10 @@ Forthcoming
 * Compress bag files in separate threads (`#506 <https://github.com/ros2/rosbag2/issues/506>`_)
 * Contributors: Emerson Knapp, P. J. Reed
 
->>>>>>> Prepare bloom release 0.6.0 (#628)
 0.5.0 (2020-12-02)
 ------------------
->>>>>>> 0.5.0
 * Sqlite storage double buffering (`#546 <https://github.com/ros2/rosbag2/issues/546>`_)
 * Contributors: Adam Dąbrowski
->>>>>>> Changelog.
 
 0.4.0 (2020-11-19)
 ------------------
@@ -56,6 +30,22 @@ Forthcoming
 * Add per-message ZSTD compression (`#418 <https://github.com/ros2/rosbag2/issues/418>`_)
 * Contributors: Christophe Bedard, Devin Bonnie, Jaison Titus, Karsten Knese, Marwan Taher, Michael Jeronimo, P. J. Reed
 
+0.3.6 (2021-01-05)
+------------------
+* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
+* Contributors: Michael Jeronimo
+
+0.3.5 (2020-08-31)
+------------------
+
+0.3.4 (2020-08-05)
+------------------
+* Fix exception thrown given invalid arguments with compression enabled (`#488 <https://github.com/ros2/rosbag2/issues/488>`_) (`#489 <https://github.com/ros2/rosbag2/issues/489>`_)
+* Contributors: Devin Bonnie
+
+0.3.3 (2020-06-23)
+------------------
+
 0.3.2 (2020-06-03)
 ------------------
 * Add user provided split size to error message (`#430 <https://github.com/ros2/rosbag2/issues/430>`_)

diff --git a/rosbag2_converter_default_plugins/CHANGELOG.rst b/rosbag2_converter_default_plugins/CHANGELOG.rst
@@ -2,10 +2,17 @@
 Changelog for package rosbag2_converter_default_plugins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.6.0 (2021-02-01)
+------------------
+
+0.5.0 (2020-12-02)
+------------------
+
+0.4.0 (2020-11-19)
+------------------
+* Update the package.xml files with the latest Open Robotics maintainers (`#535 <https://github.com/ros2/rosbag2/issues/535>`_)
+* Contributors: Michael Jeronimo
 
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
 0.3.6 (2021-01-05)
 ------------------
 * Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
@@ -19,24 +26,6 @@ Changelog for package rosbag2_converter_default_plugins
 
 0.3.3 (2020-06-23)
 ------------------
-=======
-Forthcoming
------------
->>>>>>> Changelog.
-=======
-=======
-0.6.0 (2021-02-01)
-------------------
-
->>>>>>> Prepare bloom release 0.6.0 (#628)
-0.5.0 (2020-12-02)
-------------------
->>>>>>> 0.5.0
-
-0.4.0 (2020-11-19)
-------------------
-* Update the package.xml files with the latest Open Robotics maintainers (`#535 <https://github.com/ros2/rosbag2/issues/535>`_)
-* Contributors: Michael Jeronimo
 
 0.3.2 (2020-06-03)
 ------------------

diff --git a/rosbag2_cpp/CHANGELOG.rst b/rosbag2_cpp/CHANGELOG.rst
@@ -2,29 +2,6 @@
 Changelog for package rosbag2
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-0.3.6 (2021-01-05)
-------------------
-* Mutex around writer access in recorder (`#491 <https://github.com/ros2/rosbag2/issues/491>`_) (`#575 <https://github.com/ros2/rosbag2/issues/575>`_)
-* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
-* Contributors: Michael Jeronimo, Patrick Spieler
-
-0.3.5 (2020-08-31)
-------------------
-
-0.3.4 (2020-08-05)
-------------------
-
-0.3.3 (2020-06-23)
-------------------
-=======
-Forthcoming
------------
-=======
-=======
 0.6.0 (2021-02-01)
 ------------------
 * Fix build issues when rosbag2_storage is binary installed (`#585 <https://github.com/ros2/rosbag2/issues/585>`_)
@@ -33,14 +10,11 @@ Forthcoming
 * Only dereference the data pointer if it is valid. (`#581 <https://github.com/ros2/rosbag2/issues/581>`_)
 * Contributors: Chris Lalancette, Emerson Knapp, Ivan Santiago Paunovic, P. J. Reed
 
->>>>>>> Prepare bloom release 0.6.0 (#628)
 0.5.0 (2020-12-02)
 ------------------
->>>>>>> 0.5.0
 * Add back rosbag2_cpp::StorageOptions as deprecated (`#563 <https://github.com/ros2/rosbag2/issues/563>`_)
 * Sqlite storage double buffering (`#546 <https://github.com/ros2/rosbag2/issues/546>`_)
 * Contributors: Adam Dąbrowski, Jacob Perron
->>>>>>> Changelog.
 
 0.4.0 (2020-11-19)
 ------------------
@@ -61,6 +35,21 @@ Forthcoming
 * Add split by time to recording (`#409 <https://github.com/ros2/rosbag2/issues/409>`_)
 * Contributors: Dirk Thomas, Jacob Perron, Jaison Titus, Karsten Knese, Marwan Taher, Michael Jeronimo, Patrick Spieler, jhdcs, Tomoya Fujita
 
+0.3.6 (2021-01-05)
+------------------
+* Mutex around writer access in recorder (`#491 <https://github.com/ros2/rosbag2/issues/491>`_) (`#575 <https://github.com/ros2/rosbag2/issues/575>`_)
+* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
+* Contributors: Michael Jeronimo, Patrick Spieler
+
+0.3.5 (2020-08-31)
+------------------
+
+0.3.4 (2020-08-05)
+------------------
+
+0.3.3 (2020-06-23)
+------------------
+
 0.3.2 (2020-06-03)
 ------------------
 * Add user provided split size to error (`#430 <https://github.com/ros2/rosbag2/issues/430>`_)

diff --git a/rosbag2_storage/CHANGELOG.rst b/rosbag2_storage/CHANGELOG.rst
@@ -2,42 +2,17 @@
 Changelog for package rosbag2_storage
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-<<<<<<< HEAD
-0.3.6 (2021-01-05)
-------------------
-* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
-* Contributors: Michael Jeronimo
-
-0.3.5 (2020-08-31)
-------------------
-
-0.3.4 (2020-08-05)
-------------------
-
-0.3.3 (2020-06-23)
-------------------
-=======
-Forthcoming
------------
-=======
-=======
 0.6.0 (2021-02-01)
 ------------------
 * SQLite storage optimized by default (`#568 <https://github.com/ros2/rosbag2/issues/568>`_)
   * Use optimized pragmas by default in sqlite storage. Added option to use former behavior
 * Use std::filesystem compliant non-member `exists` function for path object (`#593 <https://github.com/ros2/rosbag2/issues/593>`_)
 * Contributors: Adam Dąbrowski, Josh Langsfeld
 
->>>>>>> Prepare bloom release 0.6.0 (#628)
 0.5.0 (2020-12-02)
 ------------------
->>>>>>> 0.5.0
 * Update codes since rcutils_calculate_directory_size() is changed (`#567 <https://github.com/ros2/rosbag2/issues/567>`_)
 * Contributors: Barry Xu
->>>>>>> Changelog.
 
 0.4.0 (2020-11-19)
 ------------------
@@ -46,6 +21,20 @@ Forthcoming
 * Add split by time to recording (`#409 <https://github.com/ros2/rosbag2/issues/409>`_)
 * Contributors: Karsten Knese, Michael Jeronimo, jhdcs
 
+0.3.6 (2021-01-05)
+------------------
+* Update maintainer list for Foxy (`#551 <https://github.com/ros2/rosbag2/issues/551>`_)
+* Contributors: Michael Jeronimo
+
+0.3.5 (2020-08-31)
+------------------
+
+0.3.4 (2020-08-05)
+------------------
+
+0.3.3 (2020-06-23)
+------------------
+
 0.3.2 (2020-06-03)
 ------------------