# HG changeset patch # User Martin von Zweigbergk # Date 1415230345 28800 # Node ID be6eff57d5bb68cd3f7c66e34bb4d799cc7be958 # Parent 802a873590173c5fc179350cdcd39c1441de029d evolve: add missing newlines in "parents are not common" hint diff -r 802a87359017 -r be6eff57d5bb hgext/evolve.py --- 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})