Patchwork [1,of,3,STABLE] tests: add globs for Windows

login
register
mail settings
Submitter Matt Harbison
Date Dec. 1, 2017, 6:13 a.m.
Message ID <e2eb7fb78f36ecf33f6d.1512108838@Envy>
Download mbox | patch
Permalink /patch/25845/
State Accepted
Headers show

Comments

Matt Harbison - Dec. 1, 2017, 6:13 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1510421825 18000
#      Sat Nov 11 12:37:05 2017 -0500
# Branch stable
# Node ID e2eb7fb78f36ecf33f6d398fdc38d08940961ac7
# Parent  27196b7fc1acfc78711bc4b721fcc68754354c2c
tests: add globs for Windows
Yuya Nishihara - Dec. 1, 2017, 12:41 p.m.
On Fri, 01 Dec 2017 01:13:58 -0500, Matt Harbison wrote:
> # HG changeset patch
> # User Matt Harbison <matt_harbison@yahoo.com>
> # Date 1510421825 18000
> #      Sat Nov 11 12:37:05 2017 -0500
> # Branch stable
> # Node ID e2eb7fb78f36ecf33f6d398fdc38d08940961ac7
> # Parent  27196b7fc1acfc78711bc4b721fcc68754354c2c
> tests: add globs for Windows

Queued for stable, thanks.

Patch

diff --git a/tests/test-amend-subrepo.t b/tests/test-amend-subrepo.t
--- a/tests/test-amend-subrepo.t
+++ b/tests/test-amend-subrepo.t
@@ -58,7 +58,7 @@ 
 
   $ echo a >> s/a
   $ hg add -R s
-  adding s/a
+  adding s/a (glob)
   $ hg amend
   abort: uncommitted changes in subrepository "s"
   (use --subrepos for recursive commit)
diff --git a/tests/test-audit-subrepo.t b/tests/test-audit-subrepo.t
--- a/tests/test-audit-subrepo.t
+++ b/tests/test-audit-subrepo.t
@@ -9,7 +9,7 @@ 
   $ hg init sub/.hg
   $ echo 'sub/.hg = sub/.hg' >> .hgsub
   $ hg ci -qAm 'add subrepo "sub/.hg"'
-  abort: path 'sub/.hg' is inside nested repo 'sub'
+  abort: path 'sub/.hg' is inside nested repo 'sub' (glob)
   [255]
 
 prepare tampered repo (including the commit above):
@@ -33,7 +33,7 @@ 
 on clone (and update):
 
   $ hg clone -q hgname hgname2
-  abort: path 'sub/.hg' is inside nested repo 'sub'
+  abort: path 'sub/.hg' is inside nested repo 'sub' (glob)
   [255]
 
 Test direct symlink traversal