Mercurial > evolve
view tests/hghaveaddon.py @ 4990:f3fd3c1c3da0 stable
evolve: add test to demonstrate issue6203
Current logic of content-divergence resolution contains a bug that
if resolution parent is not the parent of any of the two divergent
changesets, it could undo some changes.
I think a good solution for this is to first relocate the divergent cset
to it's obsolete parent's successor if applicable and then perform
the content-divergence resolution.
Next patch will fix the issue.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Sat, 23 Nov 2019 20:25:16 +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