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

Don't record sim-time messages before first /clock (backport #1354) #1375

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jun 7, 2023

This is an automatic backport of pull request #1354 done by Mergify.
Cherry-pick of da7528f has failed:

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

You are currently cherry-picking commit da7528f.
  (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:   README.md

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   ros2bag/ros2bag/verb/record.py
	both modified:   rosbag2_transport/src/rosbag2_transport/recorder.cpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Wait for clock at discovery startup so that messages are not written at time 0

Signed-off-by: Emerson Knapp <emerson.b.knapp@gmail.com>
(cherry picked from commit da7528f)

# Conflicts:
#	ros2bag/ros2bag/verb/record.py
#	rosbag2_transport/src/rosbag2_transport/recorder.cpp
@mergify mergify bot requested a review from a team as a code owner June 7, 2023 05:02
@mergify mergify bot requested review from gbiggs and jhdcs and removed request for a team June 7, 2023 05:02
@mergify mergify bot added the conflicts label Jun 7, 2023
@mergify mergify bot deleted the mergify/bp/humble/pr-1354 branch June 7, 2023 05:22
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