Mercurial > evolve
view tests/hghaveaddon.py @ 3827:82c72eb37f85
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 | ef361938dfa1 |
children | 6a50faea786d |
line wrap: on
line source
import hghave @hghave.check("docgraph-ext", "Extension to generate graph from repository") def docgraph(): try: import hgext.docgraph hgext.docgraph.cmdtable # trigger import except ImportError: try: import hgext3rd.docgraph hgext3rd.docgraph.cmdtable # trigger import except ImportError: return False return True