Mercurial > evolve
diff tests/test-topic-dest.t @ 3016:d12c82fd1143
tests: update test output with commit 4f969b9e0cf5 in core
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Mon, 25 Sep 2017 02:29:41 +0530 |
| parents | 62201935e1a7 |
| children | f43a310c4338 |
line wrap: on
line diff
--- a/tests/test-topic-dest.t Mon Sep 25 02:23:36 2017 +0530 +++ b/tests/test-topic-dest.t Mon Sep 25 02:29:41 2017 +0530 @@ -109,7 +109,7 @@ switching to topic elephant 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 4:cb7ae72f4a80 "babar" + rebasing 4:cb7ae72f4a80 "babar" (elephant) switching to topic elephant $ hg log -G @ 7 (elephant) babar @@ -130,7 +130,7 @@ switching to topic monkey 1 files updated, 0 files merged, 3 files removed, 0 files unresolved $ hg rebase - rebasing 5:d832ddc604ec "zephir" + rebasing 5:d832ddc604ec "zephir" (monkey) switching to topic monkey $ hg log -G @ 8 (monkey) zephir @@ -173,7 +173,7 @@ o 0 () c_alpha $ hg rebase - rebasing 9:d79a104e2902 "Huc" (tip) + rebasing 9:d79a104e2902 "Huc" (tip monkey) $ hg log -G @ 10 (monkey) Huc | @@ -225,7 +225,7 @@ switching to topic elephant 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere - rebasing 7:8d0b77140b05 "babar" + rebasing 7:8d0b77140b05 "babar" (elephant) switching to topic elephant $ hg up monkey switching to topic monkey