Repository navigation
Revert "Merge pull request #11143 from maxnoe/unix_time_ptp" - #11251
Conversation
taldcroft
added
time
Affects-dev
|
I don't think I have reverted in this repo before, but if the diff looks good to you, then it worked. 😸 |
|
p.s. Is the diff for the change log missing? |
|
Looks good apart from what @pllim noted: the changelog entry somehow was missed. How bizarre! |
|
He reverted the commit, not the pr. The changelog every is in another commit, since it requires knowing the pr number. |
|
Hmmm, I thought |
|
That PR only has 1 commit and |
Slightly OT, but check out this gem to get the PR number (most of the time) before you make the PR. |
|
That's really really weird. I confirm also that reverting the single commit doesn't catch the change log as well. Maybe there was some kind of conflict and it just silently ignores it?? Anyway I manually fixed the changelog with another commit. |
mhvk
left a comment
mhvk
left a comment
There was a problem hiding this comment.
You're surely right about there being some conflict, but very odd that git reversion does not at least warn about that! Anyway, it looks all good now, so approving.
|
The test failure seems unrelated. It would be easier to merge this before #11249, because then I don't have to fix the tests for comparing unix_tai with unix_ptp |
|
Merged! |
This reverts commit ec98320, reversing
changes made to 9603143.
Description
This pull request is to revert #11143 as part of fixing #11245.
I did this with the following since the GitHub
Revertbutton failed:But maybe @pllim knows the best way to do this?