[PATCH 2 of 3 STABLE] test-subrepo: fix globs for Windows

Matt Harbison mharbison72 at gmail.com
Mon Jul 20 22:43:56 CDT 2015


# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1437446922 14400
#      Mon Jul 20 22:48:42 2015 -0400
# Branch stable
# Node ID a4f9827b8e42fed2ff12e97e97307112b1b68fdf
# Parent  60cf2b367c21aa6df4d5e9116b3360ca9ca43f6d
test-subrepo: fix globs for Windows

It looks like these changes originated with 2538b87660be.  I'm not sure that it
was intentional, but is seems harmless enough for an error message.

diff --git a/tests/test-subrepo-deep-nested-change.t b/tests/test-subrepo-deep-nested-change.t
--- a/tests/test-subrepo-deep-nested-change.t
+++ b/tests/test-subrepo-deep-nested-change.t
@@ -143,7 +143,7 @@
   $ hg remove sub1/.hgsubstate
   $ mv sub1/.hgsub sub1/x.hgsub
   $ hg status -S
-  warning: subrepo spec file 'sub1/.hgsub' not found (glob)
+  warning: subrepo spec file 'sub1/.hgsub' not found
   R sub1/.hgsubstate
   R sub1/sub2/folder/test.txt
   ! sub1/.hgsub
diff --git a/tests/test-subrepo-missing.t b/tests/test-subrepo-missing.t
--- a/tests/test-subrepo-missing.t
+++ b/tests/test-subrepo-missing.t
@@ -24,7 +24,7 @@
   $ cp .hgsubstate .hgsubstate.old
   >>> file('.hgsubstate', 'wb').write('\ninvalid')
   $ hg st --subrepos --cwd $TESTTMP -R $TESTTMP/repo
-  abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2 (glob)
+  abort: invalid subrepository revision specifier in 'repo/.hgsubstate' line 2
   [255]
   $ mv .hgsubstate.old .hgsubstate
 
@@ -45,8 +45,8 @@
 
   $ rm .hgsub
   $ hg up 0 --cwd $TESTTMP -R $TESTTMP/repo
-  warning: subrepo spec file 'repo/.hgsub' not found (glob)
-  warning: subrepo spec file 'repo/.hgsub' not found (glob)
+  warning: subrepo spec file 'repo/.hgsub' not found
+  warning: subrepo spec file 'repo/.hgsub' not found
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ hg st
   warning: subrepo spec file '.hgsub' not found


More information about the Mercurial-devel mailing list