Mercurial > evolve
changeset 1152:be6eff57d5bb stable
evolve: add missing newlines in "parents are not common" hint
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Wed, 05 Nov 2014 15:32:25 -0800 |
| parents | 802a87359017 |
| children | 4241a5162de7 |
| files | hgext/evolve.py |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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})