[PATCH 3 of 3] test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows
Mads Kiilerich
mads at kiilerich.com
Sun Oct 14 19:45:28 CDT 2012
# HG changeset patch
# User Mads Kiilerich <mads at kiilerich.com>
# Date 1350232247 -7200
# Node ID 7faa13046c09c1a0ec086693c824afc969256d69
# Parent 46a5c837b3eb36e3d0c96974069bd3d97f0dc975
test-subrepo-recursion.t: re-introduce glob to handle \ slashes on Windows
Regression was introduced in 6047947afb6b.
Resolved by using the fine line noise '\r (no-eol) (glob) (esc)'.
diff --git a/tests/test-subrepo-recursion.t b/tests/test-subrepo-recursion.t
--- a/tests/test-subrepo-recursion.t
+++ b/tests/test-subrepo-recursion.t
@@ -282,10 +282,10 @@
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ find ../archive | sort
../archive
@@ -324,10 +324,10 @@
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
Test archiving a revision that references a subrepo that is not yet
@@ -357,10 +357,10 @@
archiving (foo) [====================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
- archiving (foo/bar) [ ] 0/1\r (no-eol) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
- archiving (foo/bar) [================================>] 1/1\r (no-eol) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
+ archiving (foo/bar) [================================>] 1/1\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
cloning subrepo foo from $TESTTMP/repo/foo
cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
More information about the Mercurial-devel
mailing list