Mercurial > evolve

changeset 6617:c8779efa4fb4 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Anton Shestakov <av6@dwimlabs.net>
date Sun, 31 Dec 2023 16:22:15 -0300
parents 5199463aef07
children 6940272bc07d 23cad1a872b6
files hgext3rd/evolve/rewriteutil.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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):