--- a/tests/test-subrepo-deep-nested-change.t Sat May 07 14:51:32 2016 +0100
+++ b/tests/test-subrepo-deep-nested-change.t Thu May 05 21:14:12 2016 -0400
@@ -305,9 +305,9 @@
archiving (sub1) [===================================>] 4/4\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
- archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ diff -r . ../wdir | egrep -v '\.hg$|^Common subdirectories:'
Only in ../wdir: .hg_archival.txt
@@ -349,9 +349,9 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
- archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ find ../wdir -type f | sort
../wdir/.hg_archival.txt
@@ -381,10 +381,10 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
- archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
- archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ cat ../wdir/.hg_archival.txt
repo: 7f491f53a367861f47ee64a80eb997d1f341b77a
@@ -512,10 +512,10 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
- archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
- archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ find ../archive_all | sort
../archive_all
@@ -549,8 +549,8 @@
archiving (sub1) [===================================>] 3/3\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ find ../archive_exclude | sort
../archive_exclude
@@ -570,9 +570,9 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/2\r (no-eol) (esc)
- archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============> ] 1/2\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 2/2\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
$ find ../archive_include | sort
../archive_include
@@ -947,7 +947,7 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
+ archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (sub3) [ <=> ] 0\r (no-eol) (esc)
@@ -961,7 +961,7 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (esc)
+ archiving (sub1/sub2) [ <=> ] 0\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
diff -Nru cloned.*/.hgsub cloned/.hgsub (glob)
--- cloned.*/.hgsub * (glob)
@@ -989,8 +989,8 @@
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving [ ] 0/8\r (no-eol) (esc)
@@ -1008,10 +1008,10 @@
archiving (sub1) [===================================>] 1/1\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/3\r (no-eol) (esc)
- archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (esc)
- archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [=========> ] 1/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [===================> ] 2/3\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 3/3\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
archiving (sub3) [ ] 0/1\r (no-eol) (esc)
@@ -1086,8 +1086,8 @@
archiving (sub1) [ <=> ] 0\r (no-eol) (esc)
\r (no-eol) (esc)
\r (no-eol) (esc)
- archiving (sub1/sub2) [ ] 0/1\r (no-eol) (esc)
- archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (esc)
+ archiving (sub1/sub2) [ ] 0/1\r (no-eol) (glob) (esc)
+ archiving (sub1/sub2) [==============================>] 1/1\r (no-eol) (glob) (esc)
\r (no-eol) (esc)
--- */cloned.*/sub1/sub2/sub2 * (glob)
+++ */cloned/sub1/sub2/sub2 * (glob)