diff tests/test-ssh-bundle1.t @ 30215:438173c41587 stable 4.0-rc

merge default into stable for 4.0 code freeze

--- a/tests/test-ssh-bundle1.t	Tue Oct 18 14:13:06 2016 -0500
+++ b/tests/test-ssh-bundle1.t	Tue Oct 18 14:15:15 2016 -0500
@@ -2,9 +2,9 @@
 parts that are not bundle1/bundle2 specific.
 
   $ cat << EOF >> $HGRCPATH
-  > [experimental]
+  > [devel]
   > # This test is dedicated to interaction through old bundle
-  > bundle2-exp = False
+  > legacy.exchange = bundle1
   > [format] # temporary settings
   > usegeneraldelta=yes
   > EOF
@@ -60,8 +60,8 @@
 
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/remote local-stream
   streaming all changes
-  4 files to transfer, 615 bytes of data
-  transferred 615 bytes in * seconds (*) (glob)
+  4 files to transfer, 602 bytes of data
+  transferred 602 bytes in * seconds (*) (glob)
   searching for changes
   no changes found
   updating to branch default
@@ -82,8 +82,8 @@
   $ hg -R local-stream book mybook
   $ hg clone -e "python \"$TESTDIR/dummyssh\"" --uncompressed ssh://user@dummy/local-stream stream2
   streaming all changes
-  4 files to transfer, 615 bytes of data
-  transferred 615 bytes in * seconds (*) (glob)
+  4 files to transfer, 602 bytes of data
+  transferred 602 bytes in * seconds (*) (glob)
   searching for changes
   no changes found
   updating to branch default