Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

[beta] Do not update semantically equivalent lockfiles with --frozen/--locked. #4716

Merged
merged 1 commit into from
Nov 12, 2017

Conversation

Mark-Simulacrum
Copy link
Member

A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.

Backport of #4714.

A previous patch in rust-lang#4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.
@rust-highfive
Copy link

r? @matklad

(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!

@Mark-Simulacrum
Copy link
Member Author

r? @alexcrichton

Patch applies cleanly.

@Mark-Simulacrum Mark-Simulacrum changed the title Do not update semantically equivalent lockfiles with --frozen/--locked. [beta] Do not update semantically equivalent lockfiles with --frozen/--locked. Nov 12, 2017
@alexcrichton
Copy link
Member

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 12, 2017

📌 Commit a96d7fd has been approved by alexcrichton

@bors
Copy link
Contributor

bors commented Nov 12, 2017

⌛ Testing commit a96d7fd with merge cee38cd...

bors added a commit that referenced this pull request Nov 12, 2017
…hton

[beta] Do not update semantically equivalent lockfiles with --frozen/--locked.

A previous patch in #4684 attempted to fix this, but didn't work for the
case where the [root] crate wasn't the first crate in the sorted package
array.

Backport of #4714.
@bors
Copy link
Contributor

bors commented Nov 12, 2017

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

@bors bors merged commit a96d7fd into rust-lang:rust-1.22.0 Nov 12, 2017
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Nov 12, 2017
Includes a few bugfixes, and updates the Cargo book.

Critically includes rust-lang/cargo#4716. This
unblocks (in theory) crater runs.
bors added a commit to rust-lang/rust that referenced this pull request Nov 13, 2017
Bump cargo to master

Includes a few bugfixes, and updates the Cargo book.

Critically includes rust-lang/cargo#4716. This
unblocks (in theory) crater runs.
bors added a commit to rust-lang/rust that referenced this pull request Nov 13, 2017
Beta next

This updates beta Cargo (brings rust-lang/cargo#4716 and rust-lang/cargo#4715), and also includes #45866.

This PR also bumps beta to .3 so that we can get a beta release soon.
@ehuss ehuss added this to the 1.22.0 milestone Feb 6, 2022
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants