Patchwork [2,of,2,evolve-ext] evolve: fix suggested commands in "parents are not common" hint

login
register
mail settings
Submitter Martin von Zweigbergk
Date Nov. 5, 2014, 11:38 p.m.
Message ID <d30fde352b51cc6837a2.1415230685@handduk2.mtv.corp.google.com>
Download mbox | patch
Permalink /patch/6592/
State Accepted
Headers show

Comments

Martin von Zweigbergk - Nov. 5, 2014, 11:38 p.m.
# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 1415230513 28800
#      Wed Nov 05 15:35:13 2014 -0800
# Branch stable
# Node ID d30fde352b51cc6837a2781df8e92a7cbf760cff
# Parent  d5d0c011263a241306d8686484a6f8d36929431a
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.
Pierre-Yves David - Nov. 6, 2014, 9:57 a.m.
On 11/05/2014 11:38 PM, Martin von Zweigbergk wrote:
> # HG changeset patch
> # User Martin von Zweigbergk <martinvonz@google.com>
> # Date 1415230513 28800
> #      Wed Nov 05 15:35:13 2014 -0800
> # Branch stable
> # Node ID d30fde352b51cc6837a2781df8e92a7cbf760cff
> # Parent  d5d0c011263a241306d8686484a6f8d36929431a
> evolve: fix suggested commands in "parents are not common" hint

Pushed to main with much thanks.

Patch

diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -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})