hgext3rd/evolve/__init__.py
changeset 3551 ce346c6165c6
parent 3550 78d3ba4e17ac
child 3552 7e8b2c9edf36
--- a/hgext3rd/evolve/__init__.py	Fri Mar 16 12:48:03 2018 +0530
+++ b/hgext3rd/evolve/__init__.py	Fri Mar 16 13:13:21 2018 +0530
@@ -1008,9 +1008,15 @@
         if movebookmark:
             bookmark = repo._activebookmark
     else:
-        for p in parents:
-            displayer.show(p)
-        repo.ui.warn(_('multiple parents, explicitly update to one\n'))
+        header = _("multiple parents, choose one to update:")
+        prevs = [p.rev() for p in parents]
+        choosedrev = utility.revselectionprompt(repo.ui, repo, prevs, header)
+        if choosedrev is None:
+            for p in parents:
+                displayer.show(p)
+            repo.ui.warn(_('multiple parents, explicitly update to one\n'))
+        else:
+            target = repo[choosedrev]
     return target, bookmark
 
 @eh.command(