Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/evolvecmd.py
changeset 3479 4b9fc8c85ee4
parent 3478 4a1ccae58323
child 3480 1799fc777f30 
--- a/hgext3rd/evolve/evolvecmd.py	Mon Jan 22 17:44:57 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Mon Jan 22 17:54:27 2018 +0530
@@ -157,7 +157,7 @@
             return (True, newid)
         except MergeFailure:
             ops = {'current': orig.node()}
-            evolvestate = state.cmdstate(repo, opts=ops)
+            evolvestate.addopts(ops)
             evolvestate.save()
             repo.ui.write_err(_('evolve failed!\n'))
             repo.ui.write_err(
evolve