Mercurial > hg
changeset 44096:e598c874b4af
tests: stabilize test-subrepo-svn.t on Windows
This partially reverts 991e4404e910, because the URL form of `C:\...` gets
escaped to `C%3A/...`, which breaks the substitution of $TESTTMP.
The forget command on 'notafile*' errored out with:
notafile*: The filename, directory name, or volume label syntax is incorrect
which I think is because '*' isn't a legal character in a file name (though I
can't trigger this directly from MSYS or cmd.exe for some reason).
Differential Revision: https://phab.mercurial-scm.org/D7816
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sat, 28 Dec 2019 12:25:16 -0500 |
| parents | e733c59f3c09 |
| children | 2f1d6180737f |
| files | tests/test-subrepo-svn.t |
| diffstat | 1 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-subrepo-svn.t Mon Jan 13 11:18:29 2020 -0800 +++ b/tests/test-subrepo-svn.t Sat Dec 28 12:25:16 2019 -0500 @@ -87,10 +87,12 @@ $ hg debugsub path s - source file:/*/$TESTTMP/svn-repo/src (glob) + source file:/*/svn-repo/src (glob) (windows !) + source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !) revision 2 path subdir/s - source file:/*/$TESTTMP/svn-repo/src (glob) + source file:/*/svn-repo/src (glob) (windows !) + source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !) revision 2 change file in svn and hg, commit @@ -113,10 +115,12 @@ At revision 3. $ hg debugsub path s - source file:/*/$TESTTMP/svn-repo/src (glob) + source file:/*/svn-repo/src (glob) (windows !) + source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !) revision 3 path subdir/s - source file:/*/$TESTTMP/svn-repo/src (glob) + source file:/*/svn-repo/src (glob) (windows !) + source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !) revision 2 missing svn file, commit should fail @@ -235,10 +239,12 @@ $ hg debugsub path s - source file:/*/$TESTTMP/svn-repo/src (glob) + source file:/*/svn-repo/src (glob) (windows !) + source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !) revision 3 path subdir/s - source file:/*/$TESTTMP/svn-repo/src (glob) + source file:/*/svn-repo/src (glob) (windows !) + source file:/*/$TESTTMP/svn-repo/src (glob) (no-windows !) revision 2 verify subrepo is contained within the repo directory @@ -574,8 +580,8 @@ Test forgetting files, not implemented in svn subrepo, used to traceback - $ hg forget 'notafile*' - notafile*: $ENOENT$ + $ hg forget 'notafile' + notafile: $ENOENT$ [1] Test a subrepo referencing a just moved svn path. Last commit rev will