Patchwork [4,of,4] tests: add globs for Windows

login
register
mail settings
Submitter Matt Harbison
Date Oct. 14, 2017, 5:54 a.m.
Message ID <3f5ff923f62da10ca569.1507960487@Envy>
Download mbox | patch
Permalink /patch/24877/
State Accepted
Headers show

Comments

Matt Harbison - Oct. 14, 2017, 5:54 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1507958412 14400
#      Sat Oct 14 01:20:12 2017 -0400
# Node ID 3f5ff923f62da10ca5695030abe31ee53d1a7b29
# Parent  a154d01373b495122cf6ee17dd90ee600b8d4f41
tests: add globs for Windows
Augie Fackler - Oct. 14, 2017, 6:13 a.m.
On Sat, Oct 14, 2017 at 01:54:47AM -0400, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1507958412 14400
> #      Sat Oct 14 01:20:12 2017 -0400
> # Node ID 3f5ff923f62da10ca5695030abe31ee53d1a7b29
> # Parent  a154d01373b495122cf6ee17dd90ee600b8d4f41
> tests: add globs for Windows

queued, thanks

Patch

diff --git a/tests/test-origbackup-conflict.t b/tests/test-origbackup-conflict.t
--- a/tests/test-origbackup-conflict.t
+++ b/tests/test-origbackup-conflict.t
@@ -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]