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

[humble] Allow to specify start offset from CLI arguments equal to 0.0 for the rosbag2 player (backport #1682) #1715

Merged
merged 2 commits into from
Jun 13, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 12, 2024

Signed-off-by: Rein Appeldoorn <[email protected]>
(cherry picked from commit 8297cb0)

# Conflicts:
#	ros2bag/ros2bag/verb/burst.py
Copy link
Author

mergify bot commented Jun 12, 2024

Cherry-pick of 8297cb0 has failed:

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

You are currently cherry-picking commit 8297cb01.
  (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:   ros2bag/ros2bag/api/__init__.py
	modified:   ros2bag/ros2bag/verb/play.py

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   ros2bag/ros2bag/verb/burst.py

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 Jun 12, 2024
@mergify mergify bot requested a review from a team as a code owner June 12, 2024 21:55
@mergify mergify bot requested review from gbiggs and hidmic and removed request for a team June 12, 2024 21:55
@MichaelOrlov MichaelOrlov changed the title Allow to specify start offset from CLI arguments equal to 0.0 for the rosbag2 player (backport #1682) [humble] Allow to specify start offset from CLI arguments equal to 0.0 for the rosbag2 player (backport #1682) Jun 12, 2024
@MichaelOrlov
Copy link
Contributor

Pulls: #1715
Gist: https://gist.githubusercontent.com/MichaelOrlov/c27c17d8acfea9e9761d17c6a298bda8/raw/60c51b2543f198694739fa6edc79ef2cabc790fc/ros2.repos
BUILD args: --packages-above-and-dependencies rosbag2_tests ros2bag
TEST args: --packages-above rosbag2_tests ros2bag
ROS Distro: humble
Job: ci_launcher
ci_launcher ran: https://ci.ros2.org/job/ci_launcher/14071

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

@MichaelOrlov MichaelOrlov merged commit 579fddf into humble Jun 13, 2024
14 checks passed
@mergify mergify bot deleted the mergify/bp/humble/pr-1682 branch June 13, 2024 17: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.

2 participants