view debian/compat @ 3792:bb7d1616407f

evolve: return the new node formed only as the replacement sometimes, the the other content divergent changeset is obsoleted in favour of the local divergent changeset in which case we should not store that as a replacement because `hg evolve --abort` will strip that changeset. Let's make sure we return the newnode only if formed. The test results shows that we are still not 100% accurate as we need to strip an obsmarker.
author Pulkit Goyal <7895pulkit@gmail.com>
date Thu, 24 May 2018 02:12:14 +0530
parents b18b00036355
children 43e9bb4de6b5
line wrap: on
line source

8