ros2 / rosbag2

Apache License 2.0
285 stars 251 forks source link

[iron] Add topics with zero message counts to the SQLiteStorage::get_metadata(). (backport #1725) (backport #1731) #1783

Closed mergify[bot] closed 3 months ago

mergify[bot] commented 3 months ago
mergify[bot] commented 3 months ago

Cherry-pick of 2a627c9172da100cac8eb52eb8c78073b0d1553d has failed:

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

You are currently cherry-picking commit 2a627c91.
  (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/package.xml
    modified:   rosbag2_cpp/test/rosbag2_cpp/test_sequential_reader.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   rosbag2_cpp/CMakeLists.txt
    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

MichaelOrlov commented 3 months ago