From: bors <bors@rust-lang.org>
Date: Sun, 12 Nov 2017 19:13:19 +0000 (+0000)
Subject: Auto merge of #4714 - Mark-Simulacrum:frozen-freezes, r=alexcrichton
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~5^2~2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=abd137ad14a8f352b48f24b11c3995d716deb260;p=cargo.git

Auto merge of #4714 - Mark-Simulacrum:frozen-freezes, r=alexcrichton

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.

cc @matklad -- fixes a problem noted in https://github.com/rust-lang/cargo/pull/4684#discussion_r147824900 which appears to have gone unfixed

r? @alexcrichton

Beta backport will be posted as soon as this is reviewed. Merges cleanly.
---

abd137ad14a8f352b48f24b11c3995d716deb260