# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1368130941 18000
# Node ID c57e99386d88851b734dfdeed68fbf000501461b
# Parent  f6109ee404d5b510dd41d1f6edadb6cbd14430b5# Parent  e958b17696febd17c7bf0c3d5d10c50b764a6374
merge with stable

diff -r f6109ee404d5 -r c57e99386d88 tests/test-commandserver.py
--- a/tests/test-commandserver.py	Thu May 09 10:51:03 2013 -0500
+++ b/tests/test-commandserver.py	Thu May 09 15:22:21 2013 -0500
@@ -257,7 +257,7 @@
     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'])
diff -r f6109ee404d5 -r c57e99386d88 tests/test-commandserver.py.out
--- a/tests/test-commandserver.py.out	Thu May 09 10:51:03 2013 -0500
+++ b/tests/test-commandserver.py.out	Thu May 09 15:22:21 2013 -0500
@@ -187,6 +187,5 @@
  runcommand phase -p .
  runcommand phase .
 5: public
-saved backup bundle to $TESTTMP/.hg/strip-backup/d3a0a68be6de-backup.hg
  runcommand branches
 default                        1:731265503d86
diff -r f6109ee404d5 -r c57e99386d88 tests/test-subrepo.t
--- a/tests/test-subrepo.t	Thu May 09 10:51:03 2013 -0500
+++ b/tests/test-subrepo.t	Thu May 09 15:22:21 2013 -0500
@@ -440,7 +440,7 @@
   [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
diff -r f6109ee404d5 -r c57e99386d88 tests/test-unionrepo.t
--- a/tests/test-unionrepo.t	Thu May 09 10:51:03 2013 -0500
+++ b/tests/test-unionrepo.t	Thu May 09 15:22:21 2013 -0500
@@ -112,7 +112,7 @@
 
 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