--- a/hgext3rd/evolve/__init__.py	Sun Jun 03 02:36:24 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Sun Jun 03 02:37:13 2018 +0530
@@ -1113,11 +1113,15 @@
             cmdutil.bailifchanged(repo)
 
         if not opts['merge']:
-            try:
-                cmdutil.bailifchanged(repo)
-            except error.Abort as exc:
-                exc.hint = _('do you want --merge?')
-                raise
+            # we only skip the check if noconflict is set
+            if ui.config('commands', 'update.check') == 'noconflict':
+                pass
+            else:
+                try:
+                    cmdutil.bailifchanged(repo)
+                except error.Abort as exc:
+                    exc.hint = _('do you want --merge?')
+                    raise
 
         children = [ctx for ctx in wparents[0].children() if not ctx.obsolete()]
         topic = _getcurrenttopic(repo)
@@ -1204,7 +1208,7 @@
         if shouldmove:
             ui.write(_('hg bookmark %s -r %s;\n') % (bm, children))
     else:
-        ret = hg.update(repo, children)
+        ret = hg.updatetotally(ui, repo, children.node(), None)
         if not ret:
             lock = tr = None
             try: