Skip to content
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

[Iron] Add topics with zero message counts to the SQLiteStorage::get_metadata(). (backport #1722) #1766

Merged
merged 2 commits into from
Aug 10, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jul 27, 2024

Copy link
Author

mergify bot commented Jul 27, 2024

Cherry-pick of 5da1796 has failed:

On branch mergify/bp/iron/pr-1722
Your branch is up to date with 'origin/iron'.

You are currently cherry-picking commit 5da1796.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   rosbag2_py/test/test_convert.py
	both modified:   rosbag2_storage_sqlite3/src/rosbag2_storage_sqlite3/sqlite_storage.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the conflicts label Jul 27, 2024
@mergify mergify bot requested a review from a team as a code owner July 27, 2024 17:55
@mergify mergify bot requested review from emersonknapp and james-rms and removed request for a team July 27, 2024 17:55
@MichaelOrlov MichaelOrlov changed the title [Humble] Add topics with zero message counts to the SQLiteStorage::get_metadata(). (backport #1722) [Iron] Add topics with zero message counts to the SQLiteStorage::get_metadata(). (backport #1722) Jul 27, 2024
…t_metadata(). (#1722)

(cherry picked from commit 5da1796)

# Conflicts:
#	rosbag2_py/test/test_convert.py
#	rosbag2_storage_sqlite3/src/rosbag2_storage_sqlite3/sqlite_storage.cpp

Signed-off-by: Michael Orlov <[email protected]>
Signed-off-by: Michael Orlov <[email protected]>
Copy link
Contributor

@MichaelOrlov MichaelOrlov left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM with green CI.

@MichaelOrlov
Copy link
Contributor

Pulls: #1766
Gist: https://gist.githubusercontent.com/MichaelOrlov/43423cc3e9fb2097ddc5387b39cfad75/raw/f10196db2dc9d928a62111644e9591441040a80f/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_cpp rosbag2_storage_sqlite3 rosbag2_tests
TEST args: --packages-above rosbag2_cpp rosbag2_storage_sqlite3 rosbag2_tests
ROS Distro: iron
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14400

  • Linux Build Status
  • Linux-aarch64 Build Status
  • Linux-rhel Build Status
  • Windows Build Status

@MichaelOrlov MichaelOrlov merged commit 64e7dec into iron Aug 10, 2024
14 checks passed
@MichaelOrlov MichaelOrlov deleted the mergify/bp/iron/pr-1722 branch August 10, 2024 01:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant