merge with stable

tests/test-commandserver.py

@@ -257,7 +257,7 b' def phasecacheafterstrip(server):'
     runcommand(server, ['phase', '.'], outfilter=sep)
 
     # strip 1::4 outside server
-    os.system('hg --config extensions.mq= strip 1')
+    os.system('hg -q --config extensions.mq= strip 1')
 
     # shouldn't raise "7966c8e3734d: no node!"
     runcommand(server, ['branches'])

tests/test-commandserver.py.out

@@ -187,6 +187,5 b' o 0:eff892de26ec'
  runcommand phase -p .
  runcommand phase .
 5: public
-saved backup bundle to $TESTTMP/.hg/strip-backup/d3a0a68be6de-backup.hg
  runcommand branches
 default                        1:731265503d86

tests/test-subrepo.t

@@ -440,7 +440,7 b' a subrepo store may be clean versus one '
   [1]
   $ hg push ../tcc
   pushing to ../tcc
-  pushing subrepo s/ss to ../tcc/s/ss
+  pushing subrepo s/ss to ../tcc/s/ss (glob)
   searching for changes
   adding changesets
   adding manifests

tests/test-unionrepo.t

@@ -112,7 +112,7 b' revsets works across repos'
 
 annotate works - an indication that linkrevs works
 
-  $ hg --cwd repo1 -R union:../repo2 annotate $TESTTMP/repo1/f -r tip
+  $ hg --cwd repo1 -Runion:../repo2 annotate $TESTTMP/repo1/f -r tip
   3: repo2-1 at top
   0: repo1-0
   1: repo1-1