--- a/tests/test-topic.t	Wed Sep 27 16:24:44 2017 +0200
+++ b/tests/test-topic.t	Wed Sep 27 16:26:30 2017 +0200
@@ -1,6 +1,6 @@
   $ . "$TESTDIR/testlib/topic_setup.sh"
 
-  $ hg init pinky --traceback
+  $ hg init pinky
   $ cd pinky
   $ cat <<EOF >> .hg/hgrc
   > [phases]
@@ -654,7 +654,7 @@
   | @  changeset:   10:4073470c35e1
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
+  | |  instability: orphan
   | |  summary:     fran?
   | |
 
@@ -679,17 +679,17 @@
   changeset:   12:18b70b8de1f0
   user:        test
   date:        Thu Jan 01 00:00:00 1970 +0000
-  trouble:     unstable
+  instability: orphan
   summary:     fran?
   
   $ hg sum
-  parent: 12:18b70b8de1f0  (unstable)
+  parent: 12:18b70b8de1f0  (orphan)
    fran?
   branch: default
   commit: (clean)
   update: 5 new changesets, 2 branch heads (merge)
   phases: 3 draft
-  unstable: 1 changesets
+  orphan: 1 changesets
   $ hg topic
      wat
   $ hg log -Gr 'draft() and not obsolete()'
@@ -704,7 +704,7 @@
   | @  changeset:   12:18b70b8de1f0
   | |  user:        test
   | |  date:        Thu Jan 01 00:00:00 1970 +0000
-  | |  trouble:     unstable
+  | |  instability: orphan
   | |  summary:     fran?
   | |
 
@@ -741,7 +741,7 @@
   $ hg ci --amend
   active topic 'watwat' grew its first changeset
   $ hg log -Gr 'draft()'
-  @  changeset:   16:6c40a4c21bbe
+  @  changeset:   15:6c40a4c21bbe
   |  tag:         tip
   |  topic:       watwat
   |  parent:      13:686a642006db
@@ -762,7 +762,7 @@
   $ hg topic --clear
   $ hg ci --amend
   $ hg log -r .
-  changeset:   18:0f9cd5070654
+  changeset:   16:0f9cd5070654
   tag:         tip
   parent:      13:686a642006db
   user:        test
@@ -775,10 +775,10 @@
   changed topic on 1 changes
 
 Testing issue5441
-  $ hg co 19
+  $ hg co 17
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg log -Gr 'draft()'
-  @  changeset:   19:980a0f608481
+  @  changeset:   17:980a0f608481
   |  tag:         tip
   |  topic:       watwat
   |  parent:      13:686a642006db
@@ -797,19 +797,19 @@
 Using the current flag
 
   $ hg topic changewat
-  $ hg topics --rev '13::19' --current
+  $ hg topics --rev '13::17' --current
   active topic 'changewat' grew its 2 first changesets
   changed topic on 2 changes
 
   $ hg log -Gr 'draft()'
-  @  changeset:   21:56c83be6105f
+  @  changeset:   19:56c83be6105f
   |  tag:         tip
   |  topic:       changewat
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     fran?
   |
-  o  changeset:   20:ceba5be9d56f
+  o  changeset:   18:ceba5be9d56f
   |  topic:       changewat
   |  parent:      3:a53952faf762
   |  user:        test
@@ -827,21 +827,21 @@
   $ hg ci -m gamma
 
   $ hg log -Gr 'draft()'
-  @  changeset:   22:0d3d805542b4
+  @  changeset:   20:0d3d805542b4
   |  tag:         tip
   |  topic:       changewat
-  |  parent:      20:ceba5be9d56f
+  |  parent:      18:ceba5be9d56f
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     gamma
   |
-  | o  changeset:   21:56c83be6105f
+  | o  changeset:   19:56c83be6105f
   |/   topic:       changewat
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     fran?
   |
-  o  changeset:   20:ceba5be9d56f
+  o  changeset:   18:ceba5be9d56f
   |  topic:       changewat
   |  parent:      3:a53952faf762
   |  user:        test
@@ -855,21 +855,21 @@
   changed topic on 3 changes
 
   $ hg log -Gr 'draft()'
-  @  changeset:   25:729ed5717393
+  @  changeset:   23:729ed5717393
   |  tag:         tip
   |  topic:       changewut
-  |  parent:      23:62e49f09f883
+  |  parent:      21:62e49f09f883
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     gamma
   |
-  | o  changeset:   24:369c6e2e5474
+  | o  changeset:   22:369c6e2e5474
   |/   topic:       changewut
   |    user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     fran?
   |
-  o  changeset:   23:62e49f09f883
+  o  changeset:   21:62e49f09f883
   |  topic:       changewut
   |  parent:      3:a53952faf762
   |  user:        test