Mercurial > evolve
diff tests/test-evolve-phase-divergence.t @ 5647:c2fab88e6d60
tests: rebase now produces different "one-line summary" output
CORE-TEST-OUTPUT-UPDATE: e9555305c5c6
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Thu, 29 Oct 2020 09:19:37 -0700 |
| parents | 452651e69848 |
| children | e5d91fd1f319 |
line wrap: on
line diff
--- a/tests/test-evolve-phase-divergence.t Sat Oct 31 18:51:09 2020 +0100 +++ b/tests/test-evolve-phase-divergence.t Thu Oct 29 09:19:37 2020 -0700 @@ -578,7 +578,7 @@ $ cd ../alice $ hg rebase -r . -d .^^^ - rebasing 9:2352021b3785 "added x to x" (bm tip) + rebasing 9:2352021b3785 bm tip "added x to x" $ hg pull ../public pulling from ../public @@ -707,7 +707,7 @@ $ hg add y $ hg ci -m "y to y and foobar to foo" $ hg rebase -r . -d .^^^ - rebasing 12:dc88f5aa9bc9 "y to y and foobar to foo" (tip) + rebasing 12:dc88f5aa9bc9 tip "y to y and foobar to foo" $ echo foo > y $ hg amend @@ -814,7 +814,7 @@ $ echo l > l $ hg ci -Aqm "added l to l" $ hg rebase -r . -d .^^^^ - rebasing 17:f3794e5a91dc "added l to l" (tip) + rebasing 17:f3794e5a91dc tip "added l to l" $ echo kl > l $ echo foo > x $ hg add x