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
reverting and restoring automation section et al... #1340
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you, I was wondering where all that text had gone! :)
thx for tugging my sleeve @nsatragno ! Others: PLEASE REVIEW -- it seems this is restoring various other commits also, see https://pr-preview.s3.amazonaws.com/w3c/webauthn/1340/28e8d9d...e2ecccd.html |
PLEASE: those nominated to review, please do so (and do so carefully)... upon closer inspection, it seems that I somehow removed the commits in the range [976391d..b5c4001], see this
It seems merging this branch will restore these commits, but please do verify that this assertion is correct. Much thanks to @nsatragno for noticing and helping with restoration. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Let's get this restoring PR merged pronto.
Looks like the offending commit is a55edbf which is a squash of PR #1329 whose HEAD at the time was commit 6bb9b19. I managed to reconstruct the deleted branch, and those two commits have identical contents. The deletion happened in the merge commit a9bff8b in PR #1329. The PR originally branched from commit 2b435a7, and a9bff8b merged commit b5c4001 from master. I think what happened is that while resolving the merge conflicts in the The heads that have been merged into master after a55edbf are a1d4e06 (squash of PR #1328), 562cafb, f67c44b, 101146b, 35c25de, b58f3a3, 243d8f7, 235385c (branched after a55edbf), 428bf82 (squash #1316), 97411db (squash #1323), 88468ca (squash #1324), a14e11d (branched after), 03f8406 (squash #1335), dbcf596 (branched after), and e48cb03 (squash #1334). I've reconstructed a new copy of the merge commit a9bff8b without the accidental revert, and a new master branch merging that followed by the other heads. I'm pleased to say the diff between the reconstructed master and the head of this PR is the empty diff! 😄 I pushed the reconstructed master as |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Based on my investigation, the contents of commit e2ecccd is exactly identical to what would be in master at this point had the mistake not been made.
thanks @emlun for the detailed analysis/explanation! (I had not yet seen it during the webauthn call earlier today)! So, in master branch, I've diffed the spec rendered at the most recent commit 8927216 from the rendered spec at commit 976391d, i.e.: [8927216..976391d], and gone through the diff and matched up new/revised text with the commits listed by HOWEVER, it seems that we've overlooked restoring the revised .svg file that @agl commited & merged-to-master for figure 6 -- the file being: @agl likely has this file on his machine and perhaps it's easiest to just open a new PR to update said file (rather than mess around trying to restore it using git-magic) ? ANYWAY, we shouldn't publish an updated working draft until we've fixed this, please. |
Isn't that the revised version of the image? To me it looks the same as the one in #1316 (comment), and both 428bf82 and master have the same blob for that file:
|
The |
Hm, thanks for checking.... very innaresting -- so yesterday, when visually reviewing the latest rendered spec—i.e. https://w3c.github.io/webauthn/#fig-stringTruncation —in Chrome, the latter image renders (for me anyway) with the vertical dashed lines miss-aligned. I recalled that @agl had committed an updated image (the one pointed to here #1316 (comment)) and so was suprised when the image in the spec in chrome renders mis-aligned (and still does this morning). In firefox (on glinux and windows) it renders fine (is mis-aligned in chrome on both platforms for me) |
somehow I accidentally deleted @nsatragno's automation section when I merged-in the updates to
draft-hodges-webauthn-registries*
, sigh....hopefully this fixes it without messing anything else up....
NOTE: WE SHOULD NOT MAKE ANY MERGES TO MASTER UNTIL THIS IS RESOLVED!
Preview | Diff