Mercurial > evolve

diff tests/test-evolve-abort-contentdiv.t @ 3827:82c72eb37f85

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: strip the relocation commit on `hg evolve --stop` While resolving content-divergence on multiple parents, we relocate one of the commit on the parent of another one and then merge the divergent changesets. Merging can leads to conflicts, and if user does `hg evolve --stop`, we need to strip that relocated changeset too! This patch does that. Test changes demonstrates the fix.
author Pulkit Goyal <7895pulkit@gmail.com>
date Mon, 11 Jun 2018 00:47:28 +0530
parents bb7d1616407f
children fb821ed44f86
line wrap: on
line diff