-
Notifications
You must be signed in to change notification settings - Fork 70
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
RFC 80: Rename master branch to main in all repositories #80
Draft
foolip
wants to merge
3
commits into
master
Choose a base branch
from
main_branch
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # RFC #80: Rename `master` branch to `main` in all repositories | ||
|
|
||
| ## Summary | ||
|
|
||
| Rename `master` branch to `main` in all repositories in the [web-platform-tests org](https://github.com/web-platform-tests). | ||
|
|
||
| ## Details | ||
|
|
||
| These are our existing repos, excluding archived and private ones: | ||
| - https://github.com/web-platform-tests/data-migration | ||
| - https://github.com/web-platform-tests/editor | ||
| - https://github.com/web-platform-tests/rfcs | ||
| - https://github.com/web-platform-tests/wpt | ||
| - https://github.com/web-platform-tests/wpt-empty | ||
| - https://github.com/web-platform-tests/wpt-metadata | ||
| - https://github.com/web-platform-tests/wpt-pr-bot | ||
| - https://github.com/web-platform-tests/wpt.fyi | ||
| - https://github.com/web-platform-tests/wpt.live | ||
|
|
||
| TODO: which external repos hardcode the name of the default branch in any WPT repo? | ||
|
|
||
| TODO: which repos need to maintain a `master` branch during a transition period? | ||
|
|
||
| TODO: impact on open PRs? | ||
|
|
||
| ## Risk | ||
|
|
||
| Calamity | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Probably many bots that interact with wpt e.g. the gecko sync bot definitely has some hardcoded branch names.
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.
Yep, it's all over Chromium's 2-way sync too:
https://source.chromium.org/chromium/chromium/src/+/main:third_party/blink/tools/blinkpy/w3c/local_wpt.py;l=39;drc=d9363a8ca4d0967ce169cad2c9d25534a1e0c25a
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.
I wasn't planning to flesh this out today, but I think what I'd propose here to make the transition work is to have both
mainandmasterbranch updated and kept in sync for a while, so that the migration in other repos can happen at a leisurely pace and not strongly coordinated with the default branch change.The alternative of having other repos be able to handle both branch names and later clean it up seems riskier and very un-fun.