# HG changeset patch # User Anton Shestakov # Date 1704050535 10800 # Node ID c8779efa4fb4beac703908976f6a7e0d2aced45f # Parent 5199463aef07cfac7d081ef9f1f1587b5f1c8907 evolve: fix typo in "mercurial" and let hasmemmergestate be True sometimes Not caught by tests because of the obvious try-except statement, but caught by pytype. diff -r 5199463aef07 -r c8779efa4fb4 hgext3rd/evolve/rewriteutil.py --- a/hgext3rd/evolve/rewriteutil.py Tue Oct 24 16:31:34 2023 -0300 +++ b/hgext3rd/evolve/rewriteutil.py Sun Dec 31 16:22:15 2023 -0300 @@ -234,7 +234,7 @@ return repomarks, revs try: - from mercural import mergestate + from mercurial import mergestate mergestate.memmergestate hasmemmergestate = True except (ImportError, AttributeError):