diff -r f1ffd093ef30 -r 3e339f6717c7 tests/test-exchange-A3.t
--- a/tests/test-exchange-A3.t	Tue Mar 14 14:47:20 2017 -0700
+++ b/tests/test-exchange-A3.t	Fri Mar 31 15:44:10 2017 +0200
@@ -1,7 +1,7 @@
 
 Initial setup
 
-  $ . $TESTDIR/_exc-util.sh
+  $ . $TESTDIR/testlib/exchange-util.sh
 
 === A.3 new branch created ===
 
@@ -76,13 +76,13 @@
   6e72f0a95b5e01a7504743aa941f69cb1fbef8b0 0000000000000000000000000000000000000000
   e5ea8f9c73143125d36658e90ef70c6d2027a5b7 3bc2ee626e11a7cf8fee7a66d069271e17d5a597
   f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 91716bfd671b5a5854a47ac5d392edfdd25e431a
-  $ hg debugstablerange --rev 'head()'
-  rev         node index size depth      obshash
-    3 e5ea8f9c7314     0    2     2 3bc2ee626e11
-    4 f6298a8ac3a4     0    2     2 91716bfd671b
-    0 a9bdc8b26820     0    1     1 000000000000
-    3 e5ea8f9c7314     1    1     2 3bc2ee626e11
-    4 f6298a8ac3a4     1    1     2 91716bfd671b
+  $ hg debugobshashrange --subranges --rev 'head()'
+           rev         node        index         size        depth      obshash
+             3 e5ea8f9c7314            0            2            2 3bc2ee626e11
+             4 f6298a8ac3a4            0            2            2 91716bfd671b
+             0 a9bdc8b26820            0            1            1 000000000000
+             3 e5ea8f9c7314            1            1            2 3bc2ee626e11
+             4 f6298a8ac3a4            1            1            2 91716bfd671b
   $ cd ..
   $ cd ..
 
@@ -181,7 +181,7 @@
   pushing to pushdest
   searching for changes
   abort: push creates new remote head e5ea8f9c7314!
-  (merge or see "hg help push" for details about pushing new heads)
+  (merge or see 'hg help push' for details about pushing new heads)
   [255]
   $ cd ..