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 @@ only show up in the test output, not in 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 @@ Test archiving to zip file (unzip output 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 @@ cloned: 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)