Add tooling for performing Josh synces #2183
Merged
Conversation
This file contains hidden or 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
It will be used for follow-up rust synces
jieyouxu
added
A-josh
JohnTitor
approved these changes
Jan 1, 2025
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 2, 2025
Turn rustc-dev-guide into a Josh subtree Discussed on [Zulip](https://rust-lang.zulipchat.com/#narrow/channel/196385-t-compiler.2Fwg-rustc-dev-guide/topic/a.20move.20to.20main.20repo.20.28rust-lang.2Frust.29). Accompanying rustc-dev-guide PR: rust-lang/rustc-dev-guide#2183 I didn't create a bootstrap step for rustc-dev-guide yet, because the rustc-dev-guide version that we currently use in this repo doesn't have linkcheck enabled and that fails tests. The subtree starts with commit [ad93c5f1c49f2aeb45f7a4954017b1e607df9f5e](rust-lang/rustc-dev-guide@ad93c5f). What I did: ``` export DIR=src/doc/rustc-dev-guide # Remove submodule git submodule status ${DIR} git submodule deinit ${DIR} git rm -r --cached ${DIR} rm -rf ${DIR} # Remove rustc-dev-guide from .gitmodules git commit -m"Removed `${DIR}` submodule" # Import history with josh git fetch https://github.com/rust-lang/rustc-dev-guide ad93c5f1c49f2aeb45f7a4954017b1e607df9f5e josh-filter ':prefix=src/doc/rustc-dev-guide' FETCH_HEAD git merge --allow-unrelated FILTERED_HEAD # A few follow-up cleanup commits ``` r? ehuss
|
Thanks for working on this! |
|
yippee :3 |
BoxyUwU
pushed a commit
to BoxyUwU/rustc-dev-guide
that referenced
this pull request
Jan 4, 2025
Kobzol
added a commit
to Kobzol/rustc-dev-guide
that referenced
this pull request
Jan 4, 2025
Kobzol
added a commit
to Kobzol/rustc-dev-guide
that referenced
this pull request
Jan 5, 2025
Kobzol
added a commit
to Kobzol/rustc-dev-guide
that referenced
this pull request
Jan 5, 2025
Kobzol
added a commit
to Kobzol/rustc-dev-guide
that referenced
this pull request
Jan 5, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Accompanying rustc PR: rust-lang/rust#134907. This PR should probably be merged before that one, but it doesn't really matter, I think.
The josh sync code was adapted from the miri repository.