-
Notifications
You must be signed in to change notification settings - Fork 2.4k
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] Do not update semantically equivalent lockfiles with --frozen/--locked. #4716
Merged
bors
merged 1 commit into
rust-lang:rust-1.22.0
from
Mark-Simulacrum:frozen-freezes-beta
Nov 12, 2017
Merged
[beta] Do not update semantically equivalent lockfiles with --frozen/--locked. #4716
bors
merged 1 commit into
rust-lang:rust-1.22.0
from
Mark-Simulacrum:frozen-freezes-beta
Nov 12, 2017
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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.
r? @matklad (rust_highfive has picked a reviewer for you, use r? to override) |
Patch applies cleanly. |
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
@bors: r+ |
📌 Commit a96d7fd has been approved by |
☀️ Test successful - status-appveyor, status-travis |
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.
This was referenced Nov 12, 2017
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.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.