Migrate relevant 3.2 commits to the new branch structure #4188
Conversation
handrews
added
the
approved pr port
|
@ralfhandl I merged your nit even though this was a port :-) Could you and @mikekistler please re-approve? |
|
@handrews Gladly, thanks! |
|
Changed to draft status to allow more discussion of the best way to add these and possibly other changes. There's more discussion on #4106 |
|
Looks like there would be schema changes to accompany these? |
|
In the TDC Call we decided to defer CIBA to 3.3 based on #4106 (if that somehow comes together quickly enough, it can get on the 3.2 train, but we won't hold up 3.2 since we're going to do 3.3 immediately after per #4210). I'm going to remove the CIBA commit(s) and take this out of draft. @karenetheridge since this is just porting pre-existing work, please feel free to make a follow-up PR for the relevant schema changes on the |
* add oauth2MetadataUrl Signed-off-by: Axel Nennker <[email protected]> * update anchor Signed-off-by: Axel Nennker <[email protected]> --------- Signed-off-by: Axel Nennker <[email protected]>
handrews
force-pushed
the
v3.2-migrate
branch
from
bdfa9bf
to
71765db
Compare
scripts/md2html/build.sh
Outdated
| @@ -41,7 +41,7 @@ cp -p ../../node_modules/respec/builds/respec-w3c.* ../../deploy/js/ | |||
| latest=`git describe --abbrev=0 --tags` | |||
| latestCopied=none | |||
| lastMinor="-" | |||
| for filename in $(ls -1 ../../versions/[23456789].*.md | sort -r) ; do | |||
| for filename in ../../versions/3.2.0.md ; do | |||
There was a problem hiding this comment.
Why this change? There is no 3.2.0.md file in the v3.2-dev branch.
There was a problem hiding this comment.
I don't remember this change being part of this PR at all, let me figure out what happened and update.
There was a problem hiding this comment.
@ralfhandl should be fixed now!
handrews
force-pushed
the
v3.2-migrate
branch
from
c8a0e74
to
09d2714
Compare
This includes the few commits that were:
v3.2.0-devv3.1.1-dev$ref, or undo-ing that removal (let's just skip the whole thing...)These were handled with
git format-patchandgit am, like we have been doing to sync different release lines. In some cases, I noticed that the anchors for the new fields were incorrect and fixed them as if they weregit ammerge conflicts (so there are not separate commits).So this should be as close to what's on
v3.2.0-devin theversions/3.2.0.mdfile as we need it to be. But not identical.