# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1415230513 28800
# Node ID 4241a5162de7c2f55a477f554284091c20d9272d
# Parent  be6eff57d5bb68cd3f7c66e34bb4d799cc7be958
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.

diff -r be6eff57d5bb -r 4241a5162de7 hgext/evolve.py
--- 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})