Skip to content

Commit 1dad69e

Browse files
authored
Add rustc-dev-guide to the list of repositories managed by josh (rust-lang#2197)
1 parent 42160c3 commit 1dad69e

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

src/external-repos.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The following external projects are managed using some form of a `subtree`:
2121
* [rustfmt](https://github.com/rust-lang/rustfmt)
2222
* [rust-analyzer](https://github.com/rust-lang/rust-analyzer)
2323
* [rustc_codegen_cranelift](https://github.com/rust-lang/rustc_codegen_cranelift)
24+
* [rustc-dev-guide](https://github.com/rust-lang/rustc-dev-guide)
2425

2526
In contrast to `submodule` dependencies
2627
(see below for those), the `subtree` dependencies are just regular files and directories which can
@@ -38,8 +39,9 @@ implement a new tool feature or test, that should happen in one collective rustc
3839
* Using the [josh] tool
3940
* `miri` ([sync guide](https://github.com/rust-lang/miri/blob/master/CONTRIBUTING.md#advanced-topic-syncing-with-the-rustc-repo))
4041
* `rust-analyzer` ([sync script](https://github.com/rust-lang/rust-analyzer/blob/2e13684be123eca7181aa48e043e185d8044a84a/xtask/src/release.rs#L147))
42+
* `rustc-dev-guide` ([sync guide](https://github.com/rust-lang/rustc-dev-guide#synchronizing-josh-subtree-with-rustc))
4143

42-
The [josh] tool is an alternative to git subtrees, which manages git history in a different way and scales better to larger repositories. Specific tooling is required to work with josh, you can check out the `miri` or `rust-analyzer` scripts linked above for inspiration. If you want to migrate a subtree from `git subtree` to josh, you can check out [this guide](https://hackmd.io/7pOuxnkdQDaL1Y1FQr65xg).
44+
The [josh] tool is an alternative to git subtrees, which manages git history in a different way and scales better to larger repositories. Specific tooling is required to work with josh, you can check out the `miri` or `rust-analyzer` scripts linked above for inspiration. If you want to migrate a repository dependency from `git subtree` or `git submodule` to josh, you can check out [this guide](https://hackmd.io/7pOuxnkdQDaL1Y1FQr65xg).
4345

4446
Below you can find a guide on how to perform push and pull synchronization with the main rustc repo using `git subtree`, although these instructions might differ repo from repo.
4547

0 commit comments

Comments
 (0)