# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@fb.com>
# Date 1438626567 25200
# Node ID 6ab5c0f40699c637c3419abc34c0bfdb70295833
# Parent  8e6de39b724d854cb92d2de3a0472ffb03627034# Parent  19c2405cb091c5ca083176c37da22697c30803be
merge with stable

diff -r 8e6de39b724d -r 6ab5c0f40699 tests/test-inhibit.t
--- a/tests/test-inhibit.t	Wed Jul 29 09:55:50 2015 -0700
+++ b/tests/test-inhibit.t	Mon Aug 03 11:29:27 2015 -0700
@@ -748,15 +748,15 @@
   71eb4f100663 tip
 
 Hidden commits cannot be pushed without --hidden
-  $ hg push -r 003a4735afde file://$pwd/inhibit2
-  pushing to file://$TESTTMP/inhibit2
+  $ hg push -r 003a4735afde $pwd/inhibit2
+  pushing to $TESTTMP/inhibit2
   abort: hidden revision '003a4735afde'!
   (use --hidden to access hidden revisions)
   [255]
 
 Visible commits can still be pushed
-  $ hg push -r 71eb4f100663 file://$pwd/inhibit2
-  pushing to file://$TESTTMP/inhibit2
+  $ hg push -r 71eb4f100663 $pwd/inhibit2
+  pushing to $TESTTMP/inhibit2
   searching for changes
   adding changesets
   adding manifests
diff -r 8e6de39b724d -r 6ab5c0f40699 tests/test-sharing.t
--- a/tests/test-sharing.t	Wed Jul 29 09:55:50 2015 -0700
+++ b/tests/test-sharing.t	Mon Aug 03 11:29:27 2015 -0700
@@ -29,7 +29,7 @@
   $ hg add file1
   $ hg commit -m'create new project'
   $ hg push
-  pushing to $TESTTMP/public
+  pushing to $TESTTMP/public (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -40,7 +40,7 @@
 
   $ cd ../dev-repo
   $ hg pull -u
-  pulling from $TESTTMP/test-repo
+  pulling from $TESTTMP/test-repo (glob)
   requesting all changes
   adding changesets
   adding manifests
@@ -81,7 +81,7 @@
 the new obsolete changeset.
   $ cd ../dev-repo
   $ hg pull -u
-  pulling from $TESTTMP/test-repo
+  pulling from $TESTTMP/test-repo (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -185,7 +185,7 @@
   $ hg commit -A -u alice -m 'fix bug 15 (v1)'
   adding file2
   $ hg push -B bug15
-  pushing to $TESTTMP/review
+  pushing to $TESTTMP/review (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -200,7 +200,7 @@
   $ echo 'Fix.' > file2
   $ hg amend -m 'fix bug 15 (v2)'
   $ hg push
-  pushing to $TESTTMP/review
+  pushing to $TESTTMP/review (glob)
   searching for changes
   adding changesets
   adding manifests
@@ -226,7 +226,7 @@
   $ hg bookmark featureX
   $ hg commit -u bob -m 'implement feature X (v1)'
   $ hg push -B featureX
-  pushing to $TESTTMP/review
+  pushing to $TESTTMP/review (glob)
   searching for changes
   remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
   adding changesets
@@ -242,7 +242,7 @@
   $ echo 'do stuff' > file1
   $ hg amend -m 'implement feature X (v2)'
   $ hg push
-  pushing to $TESTTMP/review
+  pushing to $TESTTMP/review (glob)
   searching for changes
   remote has heads on branch 'default' that are not known locally: cbdfbd5a5db2
   adding changesets