--- a/tests/test-stablesort.t	Sun Dec 10 00:20:06 2017 +0100
+++ b/tests/test-stablesort.t	Sat Nov 25 04:09:17 2017 -0500
@@ -9,7 +9,7 @@
   > [ui]
   > logtemplate = "{rev} {node|short} {desc} {tags}\n"
   > [alias]
-  > showsort = debugstablesort --template="{node|short}\n" --method branchpoint
+  > showsort = debugstablesort --template="{node|short}\n" --method basic-mergepoint
   > EOF
 
 
@@ -113,17 +113,17 @@
   fa942426a6fd
   2b6d669947cd
   43227190fef8
-  bab5d5bf48bd
-  b4594d867745
-  e46a4836065c
-  e7d9710d9fc6
-  d62d843c9a01
-  dcbb326fdec2
-  ff43616e5d0f
   4c748ffd1a46
   f0f3ef9a6cd5
   1d8d22637c2d
   2702dd0c91e7
+  bab5d5bf48bd
+  b4594d867745
+  e7d9710d9fc6
+  d62d843c9a01
+  dcbb326fdec2
+  e46a4836065c
+  ff43616e5d0f
 
 Verify the topological order
 ----------------------------
@@ -138,17 +138,17 @@
   === checking fa942426a6fd ===
   === checking 2b6d669947cd ===
   === checking 43227190fef8 ===
-  === checking bab5d5bf48bd ===
-  === checking b4594d867745 ===
-  === checking e46a4836065c ===
-  === checking e7d9710d9fc6 ===
-  === checking d62d843c9a01 ===
-  === checking dcbb326fdec2 ===
-  === checking ff43616e5d0f ===
   === checking 4c748ffd1a46 ===
   === checking f0f3ef9a6cd5 ===
   === checking 1d8d22637c2d ===
   === checking 2702dd0c91e7 ===
+  === checking bab5d5bf48bd ===
+  === checking b4594d867745 ===
+  === checking e7d9710d9fc6 ===
+  === checking d62d843c9a01 ===
+  === checking dcbb326fdec2 ===
+  === checking e46a4836065c ===
+  === checking ff43616e5d0f ===
 
 Check stability
 ===============
@@ -409,10 +409,10 @@
   D
 
   $ python "$RUNTESTDIR/md5sum.py" *.all.order
-  0c6b2e6f15249c0359b0f93e28c5bd1c  A.all.order
-  0c6b2e6f15249c0359b0f93e28c5bd1c  B.all.order
-  0c6b2e6f15249c0359b0f93e28c5bd1c  C.all.order
-  0c6b2e6f15249c0359b0f93e28c5bd1c  D.all.order
+  4f54f623da142833149055fb83022a7e  A.all.order
+  4f54f623da142833149055fb83022a7e  B.all.order
+  4f54f623da142833149055fb83022a7e  C.all.order
+  4f54f623da142833149055fb83022a7e  D.all.order
 
 one specific head
 
@@ -617,14 +617,14 @@
   abf57d94268b
   529dfc5bb875
   e7bd5218ca15
+  6ee532b68cfa
+  001194dd78d5
   3a367db1fabc
   a2f58e9c1e56
   5f18015f9110
   9fff0871d230
   4dbf739dd63f
   d64d500024d1
-  6ee532b68cfa
-  001194dd78d5
   0496f0a6a143
   1c645e73dbc6
   160a7a0adbf4
@@ -639,14 +639,14 @@
   === checking abf57d94268b ===
   === checking 529dfc5bb875 ===
   === checking e7bd5218ca15 ===
+  === checking 6ee532b68cfa ===
+  === checking 001194dd78d5 ===
   === checking 3a367db1fabc ===
   === checking a2f58e9c1e56 ===
   === checking 5f18015f9110 ===
   === checking 9fff0871d230 ===
   === checking 4dbf739dd63f ===
   === checking d64d500024d1 ===
-  === checking 6ee532b68cfa ===
-  === checking 001194dd78d5 ===
   === checking 0496f0a6a143 ===
   === checking 1c645e73dbc6 ===
   === checking 160a7a0adbf4 ===
@@ -674,8 +674,8 @@
   $ hg pull --quiet
   $ hg showsort --rev 'all()' > ../multiple.random.order
   $ python "$RUNTESTDIR/md5sum.py" ../multiple.*.order
-  6ff802a0a5f0a3ddd82b25f860238fbd  ../multiple.random.order
-  6ff802a0a5f0a3ddd82b25f860238fbd  ../multiple.source.order
+  a6547220a9f004c975e365d9561639dd  ../multiple.random.order
+  a6547220a9f004c975e365d9561639dd  ../multiple.source.order
   $ hg showsort --rev 'all()'
   1ea73414a91b
   66f7d451a68b
@@ -684,14 +684,14 @@
   abf57d94268b
   529dfc5bb875
   e7bd5218ca15
+  6ee532b68cfa
+  001194dd78d5
   3a367db1fabc
   a2f58e9c1e56
   5f18015f9110
   9fff0871d230
   4dbf739dd63f
   d64d500024d1
-  6ee532b68cfa
-  001194dd78d5
   0496f0a6a143
   1c645e73dbc6
   160a7a0adbf4