tests/test-topic-tutorial.t
changeset 3016 d12c82fd1143
parent 3013 945a0989e41b
child 3021 5f4c42d4f2e8
--- a/tests/test-topic-tutorial.t	Mon Sep 25 02:23:36 2017 +0530
+++ b/tests/test-topic-tutorial.t	Mon Sep 25 02:29:41 2017 +0530
@@ -483,10 +483,10 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 1:13900241408b "adding condiments"
+  rebasing 1:13900241408b "adding condiments" (food)
   merging shopping
   switching to topic food
-  rebasing 2:287de11b401f "adding fruits"
+  rebasing 2:287de11b401f "adding fruits" (food)
   merging shopping
 
   $ hg log --graph
@@ -1034,12 +1034,12 @@
 #endif
 
   $ hg rebase
-  rebasing 6:183984ef46d1 "Adding hammer"
+  rebasing 6:183984ef46d1 "Adding hammer" (tools)
   merging shopping
   switching to topic tools
-  rebasing 7:cffff85af537 "Adding saw"
+  rebasing 7:cffff85af537 "Adding saw" (tools)
   merging shopping
-  rebasing 8:34255b455dac "Adding drill"
+  rebasing 8:34255b455dac "Adding drill" (tools)
   merging shopping
 
 But what about the other topic? You can use 'hg topics --verbose' to see
@@ -1066,10 +1066,10 @@
 multiple *public* heads it would create on that branch:
 
   $ hg rebase -b drinks
-  rebasing 9:8dfa45bd5e0c "Adding apple juice"
+  rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks)
   merging shopping
   switching to topic drinks
-  rebasing 10:70dfa201ed73 "Adding orange juice"
+  rebasing 10:70dfa201ed73 "Adding orange juice" (drinks)
   merging shopping
   switching to topic tools
 
@@ -1754,9 +1754,9 @@
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 
   $ hg rebase
-  rebasing 19:d5c51ee5762a "Adding saw"
+  rebasing 19:d5c51ee5762a "Adding saw" (tools)
   merging shopping
-  rebasing 20:bae3758e46bf "Adding drill"
+  rebasing 20:bae3758e46bf "Adding drill" (tools)
   merging shopping
 
   $ hg stack