Mercurial > hg-stable
changeset 25865:a48a7c2d1fea stable
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.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Mon, 20 Jul 2015 22:48:42 -0400 |
| parents | 84074e4fc80f |
| children | 8c1d7a0e737b |
| files | tests/test-subrepo-deep-nested-change.t tests/test-subrepo-missing.t |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-subrepo-deep-nested-change.t Mon Jul 20 22:44:53 2015 -0400 +++ b/tests/test-subrepo-deep-nested-change.t Mon Jul 20 22:48:42 2015 -0400 @@ -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
--- a/tests/test-subrepo-missing.t Mon Jul 20 22:44:53 2015 -0400 +++ b/tests/test-subrepo-missing.t Mon Jul 20 22:48:42 2015 -0400 @@ -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