--- a/tests/test-topic-tutorial.t Fri Jun 08 22:52:52 2018 +0530
+++ b/tests/test-topic-tutorial.t Fri Jun 08 22:52:53 2018 +0530
@@ -382,7 +382,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
- new changesets 6104862e8b84
(run 'hg heads' to see heads)
$ hg log -G
@@ -486,10 +485,10 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
- rebasing 1:13900241408b "adding condiments" (food)
+ rebasing 1:13900241408b "adding condiments"
merging shopping
switching to topic food
- rebasing 2:287de11b401f "adding fruits" (food)
+ rebasing 2:287de11b401f "adding fruits"
merging shopping
$ hg log --graph
@@ -836,7 +835,6 @@
adding manifests
adding file changes
added 2 changesets with 2 changes to 1 files (+1 heads)
- new changesets f2d6cacc6115:fbff9bc37a43
(run 'hg heads' to see heads)
There are new changes! We can simply use ``hg rebase`` to update our
@@ -1050,12 +1048,12 @@
#endif
$ hg rebase
- rebasing 6:183984ef46d1 "Adding hammer" (tools)
+ rebasing 6:183984ef46d1 "Adding hammer"
merging shopping
switching to topic tools
- rebasing 7:cffff85af537 "Adding saw" (tools)
+ rebasing 7:cffff85af537 "Adding saw"
merging shopping
- rebasing 8:34255b455dac "Adding drill" (tools)
+ rebasing 8:34255b455dac "Adding drill"
merging shopping
But what about the other topic? You can use 'hg topics --verbose' to see
@@ -1082,10 +1080,10 @@
multiple *public* heads it would create on that branch:
$ hg rebase -b drinks
- rebasing 9:8dfa45bd5e0c "Adding apple juice" (drinks)
+ rebasing 9:8dfa45bd5e0c "Adding apple juice"
merging shopping
switching to topic drinks
- rebasing 10:70dfa201ed73 "Adding orange juice" (drinks)
+ rebasing 10:70dfa201ed73 "Adding orange juice"
merging shopping
switching to topic tools
@@ -1198,7 +1196,7 @@
t0^ add a pair of shoes (base)
$ hg amend -m "Adding hammer to the shopping list"
- 2 new orphan changesets
+ 2 new unstable changesets
Understanding the current situation with hg log is not so easy, because
it shows too many things:
@@ -1227,21 +1225,21 @@
| | topic: tools
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: Adding drill
| |
| o changeset: 14:d4f97f32f8a1
| | topic: tools
| | user: test
| | date: Thu Jan 01 00:00:00 1970 +0000
- | | instability: orphan
+ | | trouble: unstable
| | summary: Adding saw
| |
| x changeset: 13:a8ab3599d53d
|/ topic: tools
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
- | obsolete: reworded using amend as 18:b7509bd417f8
+ | obsolete: reworded as b7509bd417f8
| summary: Adding hammer
|
o changeset: 12:fbff9bc37a43
@@ -1771,9 +1769,9 @@
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg rebase
- rebasing 19:d5c51ee5762a "Adding saw" (tools)
+ rebasing 19:d5c51ee5762a "Adding saw"
merging shopping
- rebasing 20:bae3758e46bf "Adding drill" (tools)
+ rebasing 20:bae3758e46bf "Adding drill"
merging shopping
$ hg stack
@@ -1841,7 +1839,6 @@
adding file changes
added 4 changesets with 4 changes to 1 files (+1 heads)
8 new obsolescence markers
- new changesets b7509bd417f8:2d084ac00115
(run 'hg heads' to see heads)
$ hg topics --verbose
@@ -1885,7 +1882,6 @@
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
- new changesets 0d409663a1fd
(run 'hg update' to get a working copy)
$ hg update