Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
evolve: add missing newlines in "parents are not common" hint stable
authorMartin von Zweigbergk <martinvonz@google.com>
Wed, 05 Nov 2014 15:32:25 -0800
branchstable
changeset 1152 be6eff57d5bb
parent 1151 802a87359017
child 1153 4241a5162de7
evolve: add missing newlines in "parents are not common" hint
hgext/evolve.py file | annotate | diff | comparison | revisions 
--- a/hgext/evolve.py	Mon Nov 03 11:41:10 2014 +0000
+++ b/hgext/evolve.py	Wed Nov 05 15:32:25 2014 -0800
@@ -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})
evolve