comparison setup.py @ 42958:181e52f2b62f stable 5.1.2

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.
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 20 Sep 2019 23:31:03 +0700
parents 85041e2b69c7
children 624d86262e14
comparison
equal deleted inserted replaced
42953:085295f82845 42958:181e52f2b62f