test-subrepo-recursion: more aggressively regex 'unzip -l' output for 10.10
The output on 10.10 looks like this:
Length Date Time Name
-------- ---- ---- ----
172 01-01-80 00:00 .hg_archival.txt
10 01-01-80 00:00 .hgsub
45 01-01-80 00:00 .hgsubstate
3 01-01-80 00:00 x.txt
10 01-01-80 00:00 foo/.hgsub
45 01-01-80 00:00 foo/.hgsubstate
9 01-01-80 00:00 foo/y.txt
9 01-01-80 00:00 foo/bar/z.txt
-------- -------
303 8 files
(2 digit year, shorter -- separators and closer columns). We don't care about
any of that, so ignore it.
--- a/tests/test-subrepo-recursion.t Tue Jun 16 22:15:30 2015 -0700
+++ b/tests/test-subrepo-recursion.t Wed Jun 17 16:45:25 2015 -0400
@@ -325,18 +325,18 @@
$ unzip -l ../archive.zip
Archive: ../archive.zip
- Length Date Time Name
- --------- ---------- ----- ----
- 172 ?????????? 00:00 .hg_archival.txt (glob)
- 10 ?????????? 00:00 .hgsub (glob)
- 45 ?????????? 00:00 .hgsubstate (glob)
- 3 ?????????? 00:00 x.txt (glob)
- 10 ?????????? 00:00 foo/.hgsub (glob)
- 45 ?????????? 00:00 foo/.hgsubstate (glob)
- 9 ?????????? 00:00 foo/y.txt (glob)
- 9 ?????????? 00:00 foo/bar/z.txt (glob)
- --------- -------
- 303 8 files
+ Length [ ]* Date [ ]* Time [ ]* Name (re)
+ [\- ]* (re)
+ 172 [0-9:\- ]* .hg_archival.txt (re)
+ 10 [0-9:\- ]* .hgsub (re)
+ 45 [0-9:\- ]* .hgsubstate (re)
+ 3 [0-9:\- ]* x.txt (re)
+ 10 [0-9:\- ]* foo/.hgsub (re)
+ 45 [0-9:\- ]* foo/.hgsubstate (re)
+ 9 [0-9:\- ]* foo/y.txt (re)
+ 9 [0-9:\- ]* foo/bar/z.txt (re)
+ [\- ]* (re)
+ 303 [ ]* 8 files (re)
Test archiving a revision that references a subrepo that is not yet
cloned: