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

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

[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 https://github.com/rust-lang/cargo/pull/4714.
---

cee38cd30d16b343b13721ec813dc89eb1c1642d