Mercurial > evolve
diff tests/test-topic-rebase.t @ 5706:59b2be90e9fd stable
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 | b1e057fb7837 |
| children | b3d9e6c805d6 |
line wrap: on
line diff
--- a/tests/test-topic-rebase.t Tue Nov 24 18:04:40 2020 -0800 +++ b/tests/test-topic-rebase.t Thu Oct 29 09:19:37 2020 -0700 @@ -72,7 +72,7 @@ switching to topic myfeature 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ hg rebase - rebasing 1:39e7a938055e "add feature1" (myfeature) + rebasing 1:39e7a938055e myfeature "add feature1" switching to topic myfeature $ hg stack ### topic: myfeature @@ -123,7 +123,7 @@ switching to topic myotherfeature 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) + rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" merging file warning: conflicts while merging file! (edit, then use 'hg resolve --mark') switching to topic myotherfeature @@ -137,7 +137,7 @@ (no more unresolved files) continue: hg rebase --continue $ hg rebase --continue - rebasing 5:81f854012ec5 "myotherfeature1" (myotherfeature) + rebasing 5:81f854012ec5 myotherfeature "myotherfeature1" Check the the commit has the right topic @@ -175,7 +175,7 @@ $ echo x > a.txt $ hg ci -Aqm x $ hg rebase -r . -d 3 --config rebase.experimental.inmemory=1 - rebasing 8:1323571d782d "x" (tip myotherfeature) + rebasing 8:1323571d782d tip myotherfeature "x" switching to topic myfeature switching to topic myotherfeature $ logtopic