Mercurial > public > mercurial-scm > hg-stable

diff tests/test-mq-subrepo.t @ 23348:bbe56e07e07a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: fix globs for Windows test-largefiles-update.t, test-subrepo.t, test-tag.t, and test-rename-dir-merge.t still warn about no result returned because of unnecessary globs that test-check-code-hg.t wants, relating to output for pushing to, pulling from and moving X to Y.
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 16 Nov 2014 16:26:15 -0500
parents e955549cd045
children 79fceed67676
line wrap: on
line diff
--- a/tests/test-mq-subrepo.t	Tue Nov 04 12:46:00 2014 -0500
+++ b/tests/test-mq-subrepo.t	Sun Nov 16 16:26:15 2014 -0500
@@ -243,7 +243,7 @@
   [255]
   $ hg revert sub
   reverting subrepo sub
-  adding sub/a
+  adding sub/a (glob)
   $ hg qpop
   popping 1.diff
   now at: 0.diff
@@ -262,7 +262,7 @@
   [255]
   $ hg revert sub
   reverting subrepo sub
-  adding sub/a
+  adding sub/a (glob)
   $ hg qpush
   applying 1.diff
    subrepository sub diverged (local revision: b2fdb12cd82b, remote revision: aa037b301eba)