Skip to content
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

Update contributing docs for submodule/subtree changes #135770

Merged
merged 1 commit into from
Jan 20, 2025

Conversation

jieyouxu
Copy link
Member

Noticed in #135337 (comment).

r? @Kobzol (or anyone really)

@rustbot rustbot added A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2025
@Kobzol
Copy link
Contributor

Kobzol commented Jan 20, 2025

It's probably still non-trivial for someone to even figure out that a direct directory is a subtree, but this is an improvement nevertheless. Thanks!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 20, 2025

📌 Commit e749a38 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jan 20, 2025
@jieyouxu
Copy link
Member Author

It's probably still non-trivial for someone to even figure out that a direct directory is a subtree, but this is an improvement nevertheless. Thanks!

Yeah, it's still difficult because there's a hybrid mix of submodules and subtrees and that list can keep changing.

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 20, 2025
…uting, r=Kobzol

Update contributing docs for submodule/subtree changes

Noticed in rust-lang#135337 (comment).

r? `@Kobzol` (or anyone really)
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#133695 (Reexport likely/unlikely in std::hint)
 - rust-lang#135330 (Respect --sysroot for rustc -vV and -Cpasses=list)
 - rust-lang#135333 (Partial progress on rust-lang#132735: Replace extern "rust-intrinsic" with #[rustc_intrinsic] across the codebase)
 - rust-lang#135741 (Recognise new IPv6 documentation range from IETF RFC 9637)
 - rust-lang#135770 (Update contributing docs for submodule/subtree changes)
 - rust-lang#135775 (Subtree update of `rust-analyzer`)
 - rust-lang#135776 (Subtree sync for rustc_codegen_cranelift)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit ab69a95 into rust-lang:master Jan 20, 2025
6 checks passed
@rustbot rustbot added this to the 1.86.0 milestone Jan 20, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jan 20, 2025
Rollup merge of rust-lang#135770 - jieyouxu:subtree-submodule-contributing, r=Kobzol

Update contributing docs for submodule/subtree changes

Noticed in rust-lang#135337 (comment).

r? ``@Kobzol`` (or anyone really)
@jieyouxu jieyouxu deleted the subtree-submodule-contributing branch January 21, 2025 00:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-meta Area: Issues & PRs about the rust-lang/rust repository itself S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants