diff -r f1ffd093ef30 -r 3e339f6717c7 tests/test-exchange-A6.t
--- a/tests/test-exchange-A6.t	Tue Mar 14 14:47:20 2017 -0700
+++ b/tests/test-exchange-A6.t	Fri Mar 31 15:44:10 2017 +0200
@@ -3,7 +3,7 @@
 
 Initial setup
 
-  $ . $TESTDIR/_exc-util.sh
+  $ . $TESTDIR/testlib/exchange-util.sh
 
 
 === A.6 between existing changeset ===
@@ -63,11 +63,11 @@
   a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 0000000000000000000000000000000000000000
   28b51eb45704506b5c603decd6bf7ac5e0f6a52f 0000000000000000000000000000000000000000
   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597
-  $ hg debugstablerange --rev 'head()'
-  rev         node index size depth      obshash
-    2 e5ea8f9c7314     0    2     2 3bc2ee626e11
-    0 a9bdc8b26820     0    1     1 000000000000
-    2 e5ea8f9c7314     1    1     2 3bc2ee626e11
+  $ hg debugobshashrange --subranges --rev 'head()'
+           rev         node        index         size        depth      obshash
+             2 e5ea8f9c7314            0            2            2 3bc2ee626e11
+             0 a9bdc8b26820            0            1            1 000000000000
+             2 e5ea8f9c7314            1            1            2 3bc2ee626e11
   $ cd ..
   $ cd ..