From: bors <bors@rust-lang.org>
Date: Wed, 22 Nov 2017 14:26:57 +0000 (+0000)
Subject: Auto merge of #4739 - kennytm:backport-4672, r=matklad
X-Git-Tag: archive/raspbian/0.35.0-2+rpi1~3^2^2^2^2^2^2^2~22^2~6^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=61fa02415ee1bc17a0c364c1c67107953d04ea87;p=cargo.git

Auto merge of #4739 - kennytm:backport-4672, r=matklad

[beta] When uplifting directories, symlink them instead of hard-link them.

Backport of #4672 to 1.22 (cargo 0.23)

The current stable RC (cee38cd30) contains #4616 *but not* #4672. Without the latter it is known to cause #4671 on APFS (enabled by default on macOS 10.13 "High Sierra").

The issue was found by kpy3 on https://internals.rust-lang.org/t/rust-1-22-0-prerelease-testing/6282/2.
---

61fa02415ee1bc17a0c364c1c67107953d04ea87