[PATCH 1 of 2] tests: fix globs for Windows
Matt Harbison
mharbison72 at gmail.com
Mon Nov 16 03:53:24 UTC 2015
# HG changeset patch
# User Matt Harbison <matt_harbison at yahoo.com>
# Date 1447639933 18000
# Sun Nov 15 21:12:13 2015 -0500
# Node ID 9f300d76e9270344fbb9ec4a04203608380d8a98
# Parent 2da6a2dbfc42bdec4bcaf47da947c64ff959a59c
tests: fix globs for Windows
diff --git a/tests/test-largefiles-misc.t b/tests/test-largefiles-misc.t
--- a/tests/test-largefiles-misc.t
+++ b/tests/test-largefiles-misc.t
@@ -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
diff --git a/tests/test-mq.t b/tests/test-mq.t
--- a/tests/test-mq.t
+++ b/tests/test-mq.t
@@ -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
diff --git a/tests/test-resolve.t b/tests/test-resolve.t
--- a/tests/test-resolve.t
+++ b/tests/test-resolve.t
@@ -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')
diff --git a/tests/test-revert.t b/tests/test-revert.t
--- a/tests/test-revert.t
+++ b/tests/test-revert.t
@@ -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
diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -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
More information about the Mercurial-devel
mailing list