# HG changeset patch # User Sushil khanchi # Date 1598013337 -19800 # Node ID cc0f46025c7f06ffe26b5623707fae8720bc9b79 # Parent 6289ddfb9d482d381af7683255531612e6d5f940 evolve: remove trailing white spaces diff -r 6289ddfb9d48 -r cc0f46025c7f hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Fri Aug 21 18:04:48 2020 +0530 +++ b/hgext3rd/evolve/evolvecmd.py Fri Aug 21 18:05:37 2020 +0530 @@ -400,9 +400,9 @@ msg = _(b"skipping %s: have a different parent than %s " b"(not handled yet)\n") % (divergent, other) hint = _(b"| %(d)s, %(o)s are not based on the same changeset.\n" - b"| With the current state of its implementation, \n" + b"| With the current state of its implementation,\n" b"| evolve does not work in that case.\n" - b"| rebase one of them next to the other and run \n" + b"| rebase one of them next to the other and run\n" b"| this command again.\n" b"| - either: hg rebase --dest 'p1(%(d)s)' -r %(o)s\n" b"| - or: hg rebase --dest 'p1(%(o)s)' -r %(d)s\n" diff -r 6289ddfb9d48 -r cc0f46025c7f tests/test-evolve-content-divergent-stack.t --- a/tests/test-evolve-content-divergent-stack.t Fri Aug 21 18:04:48 2020 +0530 +++ b/tests/test-evolve-content-divergent-stack.t Fri Aug 21 18:05:37 2020 +0530 @@ -1162,9 +1162,9 @@ $ hg evolve --content-divergent skipping 8b68d5104188: have a different parent than cf9a46e19942 (not handled yet) | 8b68d5104188, cf9a46e19942 are not based on the same changeset. - | With the current state of its implementation, + | With the current state of its implementation, | evolve does not work in that case. - | rebase one of them next to the other and run + | rebase one of them next to the other and run | this command again. | - either: hg rebase --dest 'p1(8b68d5104188)' -r cf9a46e19942 | - or: hg rebase --dest 'p1(cf9a46e19942)' -r 8b68d5104188