--- a/tests/test-topic-stack.t	Thu Sep 07 19:43:07 2017 +0200
+++ b/tests/test-topic-stack.t	Sat Sep 09 22:32:50 2017 +0530
@@ -532,24 +532,26 @@
   o  0 default {} public c_a
   
 XXX: The following should show single heads
+XXX: The behind count is weird, because the topic are interleaved.
+
   $ hg stack
-  ### topic: foobar (2 heads)
+  ### topic: foobar
   ### branch: default, 3 behind
-  t2: c_D
-    ^ c_c
-  t1@ c_e (current)
-  t0^ c_h (base)
+  t2@ c_e (current)
+    ^ c_h
+  t1: c_D
+  t0^ c_c (base)
 
   $ hg stack foo
-  ### topic: foo (3 heads)
+  ### topic: foo
   ### branch: default, ambigious rebase destination
-  t4: c_c
-    ^ c_b
+  t4: c_f
+    ^ c_e
   t3: c_h
   t2: c_g
     ^ c_D
-  t1: c_f
-  t0^ c_e (base)
+  t1: c_c
+  t0^ c_b (base)
 
 case involving a merge
 ----------------------
@@ -618,27 +620,26 @@
   
 
   $ hg stack red
-  ### topic: red (3 heads)
+  ### topic: red
   ### branch: default, 6 behind
-  t5: c_C
-  t2^ c_B (base)
-  t4: c_F
-  t3: c_E
-  t2: c_B
-    ^ c_A
-  t1: c_H
+  t5: c_H
     ^ c_G
     ^ c_D
-  t0^ c_D (base)
+  t4: c_C
+  t1^ c_B (base)
+  t3: c_F
+  t2: c_E
+  t1: c_B
+  t0^ c_A (base)
   $ hg stack blue
-  ### topic: blue (3 heads)
+  ### topic: blue
   ### branch: default, ambigious rebase destination
-  t3: c_D
+  t3@ c_I (current)
+    ^ c_H
+  t2: c_D
     ^ c_C
-  t2: c_G
-    ^ c_F
-  t1@ c_I (current)
-  t0^ c_H (base)
+  t1: c_G
+  t0^ c_F (base)
 
 Even with some obsolete and orphan changesets
 
@@ -684,7 +685,7 @@
   
 
   $ hg stack red
-  ### topic: red (3 heads)
+  ### topic: red
   ### branch: default, ambigious rebase destination
   t5$ c_H (unstable)
     ^ c_G
@@ -696,12 +697,12 @@
   t1: c_B
   t0^ c_A (base)
   $ hg stack blue
-  ### topic: blue (3 heads)
+  ### topic: blue
   ### branch: default, ambigious rebase destination
-  t3$ c_G (unstable)
+  t3$ c_I (unstable)
+    ^ c_H
+  t2$ c_G (unstable)
     ^ c_F
-  t2$ c_I (unstable)
-    ^ c_H
   t1$ c_D (current unstable)
   t0^ c_C (base)
 
@@ -758,7 +759,7 @@
   
 
   $ hg stack red
-  ### topic: red (3 heads)
+  ### topic: red
   ### branch: default, ambigious rebase destination
   t5$ c_H (unstable)
     ^ c_G
@@ -770,7 +771,7 @@
   t1: c_B
   t0^ c_A (base)
   $ hg stack blue
-  ### topic: blue (3 heads)
+  ### topic: blue
   ### branch: default, ambigious rebase destination
   t3$ c_I (unstable)
     ^ c_H