Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add globs for Windows
authorMatt Harbison <matt_harbison@yahoo.com>
Sat, 14 Oct 2017 01:20:12 -0400
changeset 34692 4c322b95a6ab
parent 34691 857fc3313f7b
child 34693 56bb07a0b75c
tests: add globs for Windows
tests/test-origbackup-conflict.t file | annotate | diff | comparison | revisions 
--- a/tests/test-origbackup-conflict.t	Sat Oct 14 01:07:59 2017 -0400
+++ b/tests/test-origbackup-conflict.t	Sat Oct 14 01:20:12 2017 -0400
@@ -29,7 +29,7 @@
   resolving manifests
   b/c: replacing untracked file
   getting b/c
-  creating directory: $TESTTMP/repo/.hg/origbackups/b
+  creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark c1)
   $ test -f .hg/origbackups/b/c
@@ -51,7 +51,7 @@
   resolving manifests
   b: replacing untracked file
   getting b
-  removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b
+  removing conflicting directory: $TESTTMP/repo/.hg/origbackups/b (glob)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark b1)
   $ test -f .hg/origbackups/b
@@ -65,8 +65,8 @@
   resolving manifests
   b/c: replacing untracked file
   getting b/c
-  creating directory: $TESTTMP/repo/.hg/origbackups/b
-  removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
+  creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
+  removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark c1)
   $ test -d .hg/origbackups/b
@@ -98,8 +98,8 @@
   resolving manifests
   b/c: replacing untracked file
   getting b/c
-  creating directory: $TESTTMP/repo/.hg/origbackups/b
-  removing conflicting file: $TESTTMP/repo/.hg/origbackups/b
+  creating directory: $TESTTMP/repo/.hg/origbackups/b (glob)
+  removing conflicting file: $TESTTMP/repo/.hg/origbackups/b (glob)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   (activating bookmark c1)
   $ cat .hg/origbackups/b/c
@@ -116,7 +116,7 @@
   resolving manifests
   b/c: replacing untracked file
   getting b/c
-  creating directory: $TESTTMP/repo/.hg/badorigbackups/b
+  creating directory: $TESTTMP/repo/.hg/badorigbackups/b (glob)
   abort: The system cannot find the path specified: '$TESTTMP/repo/.hg/badorigbackups/b' (glob) (windows !)
   abort: Not a directory: '$TESTTMP/repo/.hg/badorigbackups/b' (no-windows !)
   [255]
Mercurial