Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
authorMatt Mackall <mpm@selenic.com>
Thu, 09 May 2013 15:22:21 -0500
changeset 19167 c57e99386d88
parent 19163 f6109ee404d5 (current diff)
parent 19166 e958b17696fe (diff)
child 19168 60b63216997c
merge with stable
tests/test-commandserver.py file | annotate | diff | comparison | revisions
tests/test-subrepo.t file | annotate | diff | comparison | revisions 
--- 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'])
--- 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
--- 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
--- 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
mercurial