diff tests/test-tutorial.t @ 1111:6328e005b6c8

merge with stable

A couple of test fix were added on stable.

--- a/tests/test-tutorial.t	Wed Sep 03 23:56:39 2014 +0200
+++ b/tests/test-tutorial.t	Thu Sep 04 09:06:18 2014 +0200
@@ -92,7 +92,7 @@
 Its first version is shared with the outside.
 
   $ hg push remote
-  pushing to $TESTTMP/remote
+  pushing to $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -218,7 +218,7 @@
 I'll get this remote changeset when pulling
 
   $ hg pull remote
-  pulling from $TESTTMP/remote
+  pulling from $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -397,7 +397,7 @@
 we can now push our change:
 
   $ hg push remote
-  pushing to $TESTTMP/remote
+  pushing to $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -517,7 +517,7 @@
 is ``true`` by default.
 
   $ hg pull local
-  pulling from $TESTTMP/local
+  pulling from $TESTTMP/local (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -575,7 +575,7 @@
 I can now exchange mutable changeset between "remote" and "local" repository.
 
   $ hg pull local
-  pulling from $TESTTMP/local
+  pulling from $TESTTMP/local (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -636,7 +636,7 @@
 When we pull from remote again we get an unstable state!
 
   $ hg pull remote
-  pulling from $TESTTMP/remote
+  pulling from $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -678,7 +678,7 @@
 share it with the outside:
 
   $ hg push other
-  pushing to $TESTTMP/other
+  pushing to $TESTTMP/other (glob)
   searching for changes
   abort: push includes unstable changeset: bf1b0d202029!
   (use 'hg evolve' to get a stable history or --force to ignore warnings)
@@ -727,7 +727,7 @@
 We can push this evolution to remote
 
   $ hg push remote
-  pushing to $TESTTMP/remote
+  pushing to $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -740,7 +740,7 @@
 
   $ cd ../remote
   $ hg pull local # we up again to trigger the warning. it was displayed during the push
-  pulling from $TESTTMP/local
+  pulling from $TESTTMP/local (glob)
   searching for changes
   no changes found
   pull obsolescence markers
@@ -769,7 +769,7 @@
 
   $ cd ../local
   $ hg pull remote
-  pulling from $TESTTMP/remote
+  pulling from $TESTTMP/remote (glob)
   searching for changes
   adding changesets
   adding manifests