W3C home > Mailing lists > Public > public-webauthn@w3.org > November 2019

Re: [webauthn] reverting and restoring automation section et al... (#1340)

From: Emil Lundberg via GitHub <sysbot+gh@w3.org>
Date: Wed, 06 Nov 2019 19:25:27 +0000
To: public-webauthn@w3.org
Message-ID: <issue_comment.created-550462834-1573068325-sysbot+gh@w3.org>
Looks like the offending commit is a55edbf89206dc329d160abf7e9eb67e8303e030 which is a squash of PR #1329 whose HEAD at the time was commit 6bb9b19a4359a79b5555e3298218ff7ec66f59c0. I managed to reconstruct the deleted branch, and those two commits have identical contents.

The deletion happened in the merge commit a9bff8be9d472813462dcf447da924171295ae99 in PR #1329. The PR originally branched from commit 2b435a7, and a9bff8be9d472813462dcf447da924171295ae99 merged commit b5c4001 from master. I think what happened is that while resolving the merge conflicts in the `draft-hodges-webauthn-registries.*` files, @equalsJeffH inadvertently removed the `index.bs` changes from staging, which meant the merge commit reverted them.

The heads that have been merged into master after a55edbf89206dc329d160abf7e9eb67e8303e030 are a1d4e06 (squash of PR #1328), 562cafb, f67c44b, 101146b, 35c25de, b58f3a3, 243d8f7, 235385c (branched after a55edb), 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 a9bff8be9d472813462dcf447da924171295ae99 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! :smile: I pushed the reconstructed master as `emlun-reconstructed-master` in case anyone wants to take a look.

GitHub Notification of comment by emlun
Please view or discuss this issue at https://github.com/w3c/webauthn/pull/1340#issuecomment-550462834 using your GitHub account
Received on Wednesday, 6 November 2019 19:25:29 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 18:59:08 UTC