Mercurial > evolve
diff tests/test-topic-tutorial.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 | 74efe8301c74 |
children | 12c53d7122a7 |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Sat Oct 31 18:51:09 2020 +0100 +++ b/tests/test-topic-tutorial.t Thu Oct 29 09:19:37 2020 -0700 @@ -488,10 +488,10 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 1:13900241408b "adding condiments" (food) + rebasing 1:13900241408b food "adding condiments" merging shopping switching to topic food - rebasing 2:287de11b401f "adding fruits" (food) + rebasing 2:287de11b401f food "adding fruits" merging shopping $ hg log --graph @@ -1055,12 +1055,12 @@ #endif $ hg rebase - rebasing 6:183984ef46d1 "Adding hammer" (tools) + rebasing 6:183984ef46d1 tools "Adding hammer" merging shopping switching to topic tools - rebasing 7:cffff85af537 "Adding saw" (tools) + rebasing 7:cffff85af537 tools "Adding saw" merging shopping - rebasing 8:34255b455dac "Adding drill" (tools) + rebasing 8:34255b455dac tools "Adding drill" merging shopping But what about the other topic? You can use 'hg topics --verbose' to see @@ -1087,10 +1087,10 @@ multiple *public* heads it would create on that branch: $ hg rebase -b drinks - rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) + rebasing 9:8dfa45bd5e0c drinks "Adding apple juice" merging shopping switching to topic drinks - rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) + rebasing 10:70dfa201ed73 drinks "Adding orange juice" merging shopping switching to topic tools @@ -1777,9 +1777,9 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 19:d5c51ee5762a "Adding saw" (tools) + rebasing 19:d5c51ee5762a tools "Adding saw" merging shopping - rebasing 20:bae3758e46bf "Adding drill" (tools) + rebasing 20:bae3758e46bf tools "Adding drill" merging shopping $ hg stack