Mercurial > evolve
diff tests/test-topic-tutorial.t @ 5754:03410b04cf10 mercurial-5.6
tests: back out changeset 59b2be90e9fd
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Thu, 28 Jan 2021 18:57:48 +0800 |
parents | 73cb6cafc930 |
children | 08c30eef85d3 |
line wrap: on
line diff
--- a/tests/test-topic-tutorial.t Thu Jan 28 18:48:41 2021 +0800 +++ b/tests/test-topic-tutorial.t Thu Jan 28 18:57:48 2021 +0800 @@ -488,10 +488,10 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg rebase - rebasing 1:13900241408b food "adding condiments" + rebasing 1:13900241408b "adding condiments" (food) merging shopping switching to topic food - rebasing 2:287de11b401f food "adding fruits" + rebasing 2:287de11b401f "adding fruits" (food) merging shopping $ hg log --graph @@ -1055,12 +1055,12 @@ #endif $ hg rebase - rebasing 6:183984ef46d1 tools "Adding hammer" + rebasing 6:183984ef46d1 "Adding hammer" (tools) merging shopping switching to topic tools - rebasing 7:cffff85af537 tools "Adding saw" + rebasing 7:cffff85af537 "Adding saw" (tools) merging shopping - rebasing 8:34255b455dac tools "Adding drill" + rebasing 8:34255b455dac "Adding drill" (tools) 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 drinks "Adding apple juice" + rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks) merging shopping switching to topic drinks - rebasing 10:70dfa201ed73 drinks "Adding orange juice" + rebasing 10:70dfa201ed73 "Adding orange juice" (drinks) 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 tools "Adding saw" + rebasing 19:d5c51ee5762a "Adding saw" (tools) merging shopping - rebasing 20:bae3758e46bf tools "Adding drill" + rebasing 20:bae3758e46bf "Adding drill" (tools) merging shopping $ hg stack