Skip to content

Conversation

albertlarsan68
Copy link
Member

This commit is not relevant in the history, but may clobber the git blame output.

@rustbot
Copy link
Collaborator

rustbot commented Jan 12, 2023

r? @Mark-Simulacrum

(rustbot has picked a reviewer for you, use r? to override)

@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 12, 2023
@Noratrieb
Copy link
Member

r? Nilstrieb
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 12, 2023

📌 Commit 22db4e131474ad7654ab6879fc7428d3f3f9995d has been approved by Nilstrieb

It is now in the queue for this repository.

@rustbot rustbot assigned Noratrieb and unassigned Mark-Simulacrum Jan 12, 2023
@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 12, 2023
@bors
Copy link
Collaborator

bors commented Jan 13, 2023

☔ The latest upstream changes (presumably #106786) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 13, 2023
@albertlarsan68 albertlarsan68 force-pushed the ignore-test-move-in-blame branch from 22db4e1 to 4a3c072 Compare January 13, 2023 06:54
@albertlarsan68
Copy link
Member Author

Rebased!

@Noratrieb
Copy link
Member

Thank your git
@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Jan 13, 2023

📌 Commit 4a3c072 has been approved by Nilstrieb

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 13, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Jan 13, 2023
…-blame, r=Nilstrieb

Ignore tests move in git blame

This commit is not relevant in the history, but may clobber the git blame output.
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 13, 2023
Rollup of 6 pull requests

Successful merges:

 - rust-lang#106608 (Render missing generics suggestion verbosely)
 - rust-lang#106716 ([RFC 2397] Deny incorrect locations)
 - rust-lang#106754 (Rename `Ty::is_ty_infer` -> `Ty::is_ty_or_numeric_infer`)
 - rust-lang#106782 (Ignore tests move in git blame)
 - rust-lang#106785 (Make blame spans better for impl wfcheck)
 - rust-lang#106791 (Fix ICE formatting)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 796847a into rust-lang:master Jan 13, 2023
@rustbot rustbot added this to the 1.68.0 milestone Jan 13, 2023
@albertlarsan68 albertlarsan68 deleted the ignore-test-move-in-blame branch January 13, 2023 14:15
flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 27, 2023
Rollup of 6 pull requests

Successful merges:

 - rust-lang#106608 (Render missing generics suggestion verbosely)
 - rust-lang#106716 ([RFC 2397] Deny incorrect locations)
 - rust-lang#106754 (Rename `Ty::is_ty_infer` -> `Ty::is_ty_or_numeric_infer`)
 - rust-lang#106782 (Ignore tests move in git blame)
 - rust-lang#106785 (Make blame spans better for impl wfcheck)
 - rust-lang#106791 (Fix ICE formatting)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
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.

5 participants