Mercurial > evolve

changeset 1153:4241a5162de7 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: fix suggested commands in "parents are not common" hint The argument to 'hg rebase' is --dest, not -dest. Also, the same command should not be suggested twice -- the second option should be the rebasing the other way around.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 05 Nov 2014 15:35:13 -0800
parents be6eff57d5bb
children 0f53c24096c6
files hgext/evolve.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py	Wed Nov 05 15:32:25 2014 -0800
+++ b/hgext/evolve.py	Wed Nov 05 15:35:13 2014 -0800
@@ -1494,8 +1494,8 @@
                          "| evolve does not work in that case.\n"
                          "| rebase one of them next to the other and run \n"
                          "| this command again.\n"
-                         "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s\n"
-                         "| - or:     hg rebase -dest 'p1(%(d)s)' -r %(o)s"
+                         "| - either: hg rebase --dest 'p1(%(d)s)' -r %(o)s\n"
+                         "| - or:     hg rebase --dest 'p1(%(o)s)' -r %(d)s"
                               % {'d': divergent, 'o': other})
 
     displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate})