[PATCH STABLE] merge: back out changeset a4ca0610c754 (parents order when grafting a merge)

[Yuya Nishihara]

On Mon, 23 Sep 2019 10:56:54 +0700, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6 at dwimlabs.net>
> # Date 1568997063 -25200
> #      Fri Sep 20 23:31:03 2019 +0700
> # Branch stable
> # Node ID 6003cc13f906fac5b6d93c5eff727e772d3dfc6a
> # Parent  085295f828459f8ce90f6f5889bac3e0405945a8
> merge: back out changeset a4ca0610c754 (parents order when grafting a merge)
> 
> Turns out it's not enough to just swap parents, because when we do, there are
> unexpected bad side effects, such as a tracked file becoming untracked. These
> side effects need more code to be handled properly, but it's not written yet.
> Let's back this feature out from stable for now and some day implement it on
> default instead.

OK. Queued for stable, thanks.