Mercurial > hg
changeset 26969:b54b520a24c2
tests: fix globs for Windows
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 15 Nov 2015 21:12:13 -0500 |
| parents | 216cc65cf227 |
| children | 6d99cc89ee0e |
| files | tests/test-largefiles-misc.t tests/test-mq.t tests/test-resolve.t tests/test-revert.t tests/test-subrepo-git.t |
| diffstat | 5 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-largefiles-misc.t Sun Nov 15 22:58:28 2015 +0100 +++ b/tests/test-largefiles-misc.t Sun Nov 15 21:12:13 2015 -0500 @@ -513,10 +513,10 @@ Test orig files go where we want them $ echo moremore >> anotherlarge $ hg revert anotherlarge -v --config 'ui.origbackuppath=.hg/origbackups' - creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub - saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge.orig + creating directory: $TESTTMP/addrm2/.hg/origbackups/.hglf/sub (glob) + saving current version of ../.hglf/sub/anotherlarge as $TESTTMP/addrm2/.hg/origbackups/.hglf/sub/anotherlarge.orig (glob) reverting ../.hglf/sub/anotherlarge (glob) - creating directory: $TESTTMP/addrm2/.hg/origbackups/sub + creating directory: $TESTTMP/addrm2/.hg/origbackups/sub (glob) found 90c622cf65cebe75c5842f9136c459333faf392e in store found 90c622cf65cebe75c5842f9136c459333faf392e in store $ ls ../.hg/origbackups/sub
--- a/tests/test-mq.t Sun Nov 15 22:58:28 2015 +0100 +++ b/tests/test-mq.t Sun Nov 15 21:12:13 2015 -0500 @@ -1396,8 +1396,8 @@ $ hg qpush -f --verbose --config 'ui.origbackuppath=.hg/origbackups' applying empty - creating directory: $TESTTMP/forcepush/.hg/origbackups - saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt.orig + creating directory: $TESTTMP/forcepush/.hg/origbackups (glob) + saving current version of hello.txt as $TESTTMP/forcepush/.hg/origbackups/hello.txt.orig (glob) patching file hello.txt committing files: hello.txt
--- a/tests/test-resolve.t Sun Nov 15 22:58:28 2015 +0100 +++ b/tests/test-resolve.t Sun Nov 15 21:12:13 2015 -0500 @@ -201,7 +201,7 @@ .orig files should exists where specified $ hg resolve --all --verbose --config 'ui.origbackuppath=.hg/origbackups' merging file1 - creating directory: $TESTTMP/repo/.hg/origbackups + creating directory: $TESTTMP/repo/.hg/origbackups (glob) merging file2 warning: conflicts while merging file1! (edit, then use 'hg resolve --mark') warning: conflicts while merging file2! (edit, then use 'hg resolve --mark')
--- a/tests/test-revert.t Sun Nov 15 22:58:28 2015 +0100 +++ b/tests/test-revert.t Sun Nov 15 21:12:13 2015 -0500 @@ -91,8 +91,8 @@ $ echo z > e $ hg revert --all -v --config 'ui.origbackuppath=.hg/origbackups' - creating directory: $TESTTMP/repo/.hg/origbackups - saving current version of e as $TESTTMP/repo/.hg/origbackups/e.orig + creating directory: $TESTTMP/repo/.hg/origbackups (glob) + saving current version of e as $TESTTMP/repo/.hg/origbackups/e.orig (glob) reverting e $ rm -rf .hg/origbackups
--- a/tests/test-subrepo-git.t Sun Nov 15 22:58:28 2015 +0100 +++ b/tests/test-subrepo-git.t Sun Nov 15 21:12:13 2015 -0500 @@ -879,8 +879,8 @@ $ echo 'bloop' > s/foobar $ hg revert --all --verbose --config 'ui.origbackuppath=.hg/origbackups' reverting subrepo ../gitroot - creating directory: $TESTTMP/tc/.hg/origbackups - saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar.orig + creating directory: $TESTTMP/tc/.hg/origbackups (glob) + saving current version of foobar as $TESTTMP/tc/.hg/origbackups/foobar.orig (glob) $ ls .hg/origbackups foobar.orig $ rm -rf .hg/origbackups