diff contrib/merge-test-compat.sh @ 3832:fb821ed44f86

evolve: strip the extra obsmarkers if any on `hg evolve --abort` Previous patches started storing some obsmarkers which needs to stripped during `evolve --abort` which can't be stripped by stripping the new evolved changesets because they point to a node which existed before the evolution was performed. This patch adds logic to strip those obsmarkers by finding their indices in the obsstore and then stripping them.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 20:17:56 +0530
parents 13a4c35f7a0b
children 6db9e2350948
line wrap: on
line diff