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

[beta] Don't update lockfiles from previous Cargo versions if --locked is passed #4687

Merged
merged 1 commit into from
Oct 31, 2017

Conversation

matklad
Copy link
Member

@matklad matklad commented Oct 31, 2017

No description provided.

@rust-highfive
Copy link

r? @alexcrichton

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

@rust-highfive
Copy link

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against rust-1.22.0. Please double check that you specified the right target!

@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Oct 31, 2017

📌 Commit a4ea687 has been approved by alexcrichton

bors added a commit that referenced this pull request Oct 31, 2017
[beta] Don't update lockfiles from previous Cargo versions if `--locked` is passed
@bors
Copy link
Contributor

bors commented Oct 31, 2017

⌛ Testing commit a4ea687 with merge 3bab084...

@bors
Copy link
Contributor

bors commented Oct 31, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 3bab084 to rust-1.22.0...

@bors bors merged commit a4ea687 into rust-lang:rust-1.22.0 Oct 31, 2017
bors added a commit to rust-lang/rust that referenced this pull request Oct 31, 2017
[beta] Cargo does not remove [root] from lockfile with --frozen

Okey, this is supposed to be a backport of rust-lang/cargo#4687, but looks like beta cargo at rust-lang and beta cargo at cargo are different at the moment, hence the huge diff (one commit in the diffrence rewrote every single test file in Cargo)

rust-lang: https://github.com/rust-lang/cargo/commits/463e850146e9454b8b953ff73772a35b286b58e7
cargo: https://github.com/rust-lang/cargo/commits/rust-1.22.0

r? @alexcrichton
@matklad matklad deleted the rust-1.22.0-backport branch March 17, 2018 08:39
@ehuss ehuss added this to the 1.22.0 milestone Feb 6, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants