[PATCH 1 of 2 evolve-ext] evolve: add missing newlines in "parents are not common" hint
Martin von Zweigbergk
martinvonz at google.com
Wed Nov 5 23:38:04 UTC 2014
# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1415230345 28800
# Wed Nov 05 15:32:25 2014 -0800
# Branch stable
# Node ID d5d0c011263a241306d8686484a6f8d36929431a
# Parent 802a873590173c5fc179350cdcd39c1441de029d
evolve: add missing newlines in "parents are not common" hint
diff --git a/hgext/evolve.py b/hgext/evolve.py
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1489,12 +1489,12 @@
"| `hg prune` to kill older version.")
if other.p1() not in divergent.parents():
raise util.Abort("parents are not common (not handled yet)",
- hint="| %(d)s, %(o)s are not based on the same changeset."
- "| With the current state of its implementation, "
+ hint="| %(d)s, %(o)s are not based on the same changeset.\n"
+ "| With the current state of its implementation, \n"
"| evolve does not work in that case.\n"
- "| rebase one of them next to the other and run "
+ "| 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"
+ "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s\n"
"| - or: hg rebase -dest 'p1(%(d)s)' -r %(o)s"
% {'d': divergent, 'o': other})
More information about the Mercurial-devel
mailing list