Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: refer to checkunresolved by its new name
authorAugie Fackler <augie@google.com>
Mon, 21 Nov 2016 21:32:39 -0500
changeset 30495 d528ddc11b33
parent 30494 c1149533676b
child 30496 a90867a22daf
rebase: refer to checkunresolved by its new name
hgext/rebase.py file | annotate | diff | comparison | revisions 
--- a/hgext/rebase.py	Mon Nov 21 21:31:45 2016 -0500
+++ b/hgext/rebase.py	Mon Nov 21 21:32:39 2016 -0500
@@ -38,6 +38,7 @@
     hg,
     lock,
     merge as mergemod,
+    mergeutil,
     obsolete,
     patch,
     phases,
@@ -665,7 +666,7 @@
                 ui.warn(_('tool option will be ignored\n'))
             if contf:
                 ms = mergemod.mergestate.read(repo)
-                cmdutil.checkunresolved(ms)
+                mergeutil.checkunresolved(ms)
 
             retcode = rbsrt._prepareabortorcontinue(abortf)
             if retcode is not None:
Mercurial