# HG changeset patch
# User Bryan O'Sullivan <bryano@fb.com>
# Date 1352311186 28800
# Node ID fb14a5dcdc62987512820531fe60719d650491b6
# Parent  d8ad046ea4e573bc7af77bb8e0bb947b17684e04# Parent  ce2c709a8e908747376a3fda6059c1f81de321e7
Merge with stable

diff -r d8ad046ea4e5 -r fb14a5dcdc62 tests/test-mq-qrefresh.t
--- a/tests/test-mq-qrefresh.t	Tue Nov 06 16:49:54 2012 -0800
+++ b/tests/test-mq-qrefresh.t	Wed Nov 07 09:59:46 2012 -0800
@@ -208,7 +208,7 @@
   $ echo 'orphan' > orphanchild
   $ hg add orphanchild
   $ hg qrefresh nonexistentfilename # clear patch
-  nonexistentfilename: No such file or directory
+  nonexistentfilename: * (glob)
   $ hg qrefresh --short 1/base
   $ hg qrefresh --short 2/base
 
diff -r d8ad046ea4e5 -r fb14a5dcdc62 tests/test-subrepo.t
--- a/tests/test-subrepo.t	Tue Nov 06 16:49:54 2012 -0800
+++ b/tests/test-subrepo.t	Wed Nov 07 09:59:46 2012 -0800
@@ -606,7 +606,7 @@
   issue3276_ok
   $ rm repo/s/b
   $ hg -R repo revert --all
-  reverting repo/.hgsubstate
+  reverting repo/.hgsubstate (glob)
   reverting subrepo s
   $ hg -R repo update
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved