Mercurial > evolve
diff tests/test-evolve-content-divergent-relocation.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 | d7d954b6d518 |
| children | e5d91fd1f319 |
line wrap: on
line diff
--- a/tests/test-evolve-content-divergent-relocation.t Sat Oct 31 18:51:09 2020 +0100 +++ b/tests/test-evolve-content-divergent-relocation.t Thu Oct 29 09:19:37 2020 -0700 @@ -627,7 +627,7 @@ The first side of the divergence get rebased on top of upstream. $ hg rebase -r . -d 'desc("upstream")' - rebasing 2:898ddd4443b3 "divergent" (tip) + rebasing 2:898ddd4443b3 tip "divergent" $ hg --hidden co 2 -q updated to hidden changeset 898ddd4443b3 (hidden revision '898ddd4443b3' was rewritten as: befae6138569)