diff -r ec04eb4d2c6e -r d65318bf1782 tests/test-exchange-A5.t
--- a/tests/test-exchange-A5.t	Tue Mar 14 14:52:56 2017 -0700
+++ b/tests/test-exchange-A5.t	Fri Mar 31 15:47:31 2017 +0200
@@ -2,7 +2,7 @@
 
 Initial setup
 
-  $ . $TESTDIR/_exc-util.sh
+  $ . $TESTDIR/testlib/exchange-util.sh
 
 
 === A.5 partial reordering ===
@@ -75,13 +75,13 @@
   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 fd3e5712c9c2d216547d7a1b87ac815ee1fb7542
   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 91716bfd671b5a5854a47ac5d392edfdd25e431a
   8c0a98c8372212c6efde4bfdcef006f27ff759d3 6e8c8c71c47a2bfc27c7cf2b1f4174977ede9f21
-  $ hg debugstablerange --rev 'head()'
-  rev         node index size depth      obshash
-    4 8c0a98c83722     0    3     3 70185b996296
-    3 f6298a8ac3a4     0    2     2 91716bfd671b
-    4 8c0a98c83722     2    1     3 4d835a45c1e9
-    0 a9bdc8b26820     0    1     1 000000000000
-    3 f6298a8ac3a4     1    1     2 91716bfd671b
+  $ hg debugobshashrange --subranges --rev 'head()'
+           rev         node        index         size        depth      obshash
+             4 8c0a98c83722            0            3            3 70185b996296
+             3 f6298a8ac3a4            0            2            2 91716bfd671b
+             4 8c0a98c83722            2            1            3 4d835a45c1e9
+             0 a9bdc8b26820            0            1            1 000000000000
+             3 f6298a8ac3a4            1            1            2 91716bfd671b
   $ cd ..
   $ cd ..