Mercurial > evolve
comparison hgext/evolve.py @ 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 | 2c99d92faa62 |
| children | 4241a5162de7 |
comparison
equal
deleted
inserted
replaced
| 1151:802a87359017 | 1152:be6eff57d5bb |
|---|---|
| 1487 hint="You have to fallback to solving this by hand...\n" | 1487 hint="You have to fallback to solving this by hand...\n" |
| 1488 "| This probably means redoing the merge and using " | 1488 "| This probably means redoing the merge and using " |
| 1489 "| `hg prune` to kill older version.") | 1489 "| `hg prune` to kill older version.") |
| 1490 if other.p1() not in divergent.parents(): | 1490 if other.p1() not in divergent.parents(): |
| 1491 raise util.Abort("parents are not common (not handled yet)", | 1491 raise util.Abort("parents are not common (not handled yet)", |
| 1492 hint="| %(d)s, %(o)s are not based on the same changeset." | 1492 hint="| %(d)s, %(o)s are not based on the same changeset.\n" |
| 1493 "| With the current state of its implementation, " | 1493 "| With the current state of its implementation, \n" |
| 1494 "| evolve does not work in that case.\n" | 1494 "| evolve does not work in that case.\n" |
| 1495 "| rebase one of them next to the other and run " | 1495 "| rebase one of them next to the other and run \n" |
| 1496 "| this command again.\n" | 1496 "| this command again.\n" |
| 1497 "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s" | 1497 "| - either: hg rebase -dest 'p1(%(d)s)' -r %(o)s\n" |
| 1498 "| - or: hg rebase -dest 'p1(%(d)s)' -r %(o)s" | 1498 "| - or: hg rebase -dest 'p1(%(d)s)' -r %(o)s" |
| 1499 % {'d': divergent, 'o': other}) | 1499 % {'d': divergent, 'o': other}) |
| 1500 | 1500 |
| 1501 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate}) | 1501 displayer = cmdutil.show_changeset(ui, repo, {'template': shorttemplate}) |
| 1502 if not ui.quiet or confirm: | 1502 if not ui.quiet or confirm: |