diff --git a/tests/test-largefiles-cache.t b/tests/test-largefiles-cache.t
--- a/tests/test-largefiles-cache.t
+++ b/tests/test-largefiles-cache.t
@@ -47,7 +47,7 @@ but there is no cache file for it. So,
$ hg update -r0
getting changed largefiles
- large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror
+ large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob)
0 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
@@ -64,7 +64,7 @@ Update working directory to tip, again.
$ hg update -r0
getting changed largefiles
- large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror
+ large: largefile 7f7097b041ccf68cc5561e9600da4655d21c6d18 not available from file:$TESTTMP/mirror (glob)
0 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg status
diff --git a/tests/test-largefiles.t b/tests/test-largefiles.t
--- a/tests/test-largefiles.t
+++ b/tests/test-largefiles.t
@@ -1278,7 +1278,7 @@ Update to revision with missing largefil
$ rm ${USERCACHE}/7838695e10da2bb75ac1156565f40a2595fa2fa0
$ hg up -r 6
getting changed largefiles
- large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d
+ large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
1 largefiles updated, 2 removed
4 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ rm normal3
@@ -1299,7 +1299,7 @@ Update to revision with missing largefil
! normal3
$ hg up -Cr.
getting changed largefiles
- large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d
+ large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
0 largefiles updated, 0 removed
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg st
@@ -1321,7 +1321,7 @@ Merge with revision with missing largefi
4 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
getting changed largefiles
- large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d
+ large3: largefile 7838695e10da2bb75ac1156565f40a2595fa2fa0 not available from file:$TESTTMP/d (glob)
1 largefiles updated, 0 removed
$ hg rollback -q
diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t
--- a/tests/test-lfconvert.t
+++ b/tests/test-lfconvert.t
@@ -343,7 +343,7 @@ Ensure the abort message is useful if a
$ rm largefiles-repo/.hg/largefiles/*
$ hg lfconvert --to-normal issue3519 normalized3519
initializing destination normalized3519
- large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo
+ large: largefile 2e000fa7e85759c7f4c254d4d9c33ef481e459a7 not available from file:$TESTTMP/largefiles-repo (glob)
abort: missing largefile 'large' from revision d4892ec57ce212905215fad1d9018f56b99202ad
[255]
diff --git a/tests/test-phases-exchange.t b/tests/test-phases-exchange.t
--- a/tests/test-phases-exchange.t
+++ b/tests/test-phases-exchange.t
@@ -1062,6 +1062,7 @@ 2. cloning publishing repository
|
o 0 public a-A - 054250a37db4
+#if unix-permissions
Pushing From an unlockable repo
--------------------------------
@@ -1102,3 +1103,4 @@ 2. Test that failed phases movement are
$ "$TESTDIR/killdaemons.py" $DAEMON_PIDS
+#endif
diff --git a/tests/test-subrepo.t b/tests/test-subrepo.t
--- a/tests/test-subrepo.t
+++ b/tests/test-subrepo.t
@@ -289,7 +289,7 @@ push
committing subrepository t
$ hg push
pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
no changes made to subrepo s since last push to $TESTTMP/t/s
pushing subrepo t to $TESTTMP/t/t
searching for changes
@@ -310,7 +310,7 @@ push -f
committing subrepository s
$ hg push
pushing to $TESTTMP/t (glob)
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
pushing subrepo s to $TESTTMP/t/s
searching for changes
abort: push creates new remote head 12a213df6fa9! (in subrepo s)
@@ -341,7 +341,7 @@ check that unmodified subrepos are not p
$ hg clone . ../tcc
updating to branch default
cloning subrepo s from $TESTTMP/tc/s
- cloning subrepo s/ss from $TESTTMP/tc/s/ss
+ cloning subrepo s/ss from $TESTTMP/tc/s/ss (glob)
cloning subrepo t from $TESTTMP/tc/t
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -349,7 +349,7 @@ the subrepos on the new clone have nothi
$ hg push -R ../tcc .
pushing to .
- no changes made to subrepo s/ss since last push to s/ss
+ no changes made to subrepo s/ss since last push to s/ss (glob)
no changes made to subrepo s since last push to s
no changes made to subrepo t since last push to t
searching for changes
@@ -361,7 +361,7 @@ because they were never explicitly pushe
$ hg push ../tcc
pushing to ../tcc
- pushing subrepo s/ss to ../tcc/s/ss
+ pushing subrepo s/ss to ../tcc/s/ss (glob)
searching for changes
no changes found
pushing subrepo s to ../tcc/s
@@ -378,7 +378,7 @@ after push their stores become clean
$ hg push ../tcc
pushing to ../tcc
- no changes made to subrepo s/ss since last push to ../tcc/s/ss
+ no changes made to subrepo s/ss since last push to ../tcc/s/ss (glob)
no changes made to subrepo s since last push to ../tcc/s
no changes made to subrepo t since last push to ../tcc/t
searching for changes
@@ -392,7 +392,7 @@ its working directory does not make its
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg push
pushing to $TESTTMP/t
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
no changes made to subrepo s since last push to $TESTTMP/t/s
no changes made to subrepo t since last push to $TESTTMP/t/t
searching for changes
@@ -401,7 +401,7 @@ its working directory does not make its
$ echo foo >> s/a
$ hg push
pushing to $TESTTMP/t
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
no changes made to subrepo s since last push to $TESTTMP/t/s
no changes made to subrepo t since last push to $TESTTMP/t/t
searching for changes
@@ -416,7 +416,7 @@ committing into a subrepo makes its stor
$ hg -R s/ss commit -m 'test dirty store detection'
$ hg push
pushing to $TESTTMP/t
- pushing subrepo s/ss to $TESTTMP/t/s/ss
+ pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
searching for changes
adding changesets
adding manifests
@@ -432,7 +432,7 @@ a subrepo store may be clean versus one
$ hg push
pushing to $TESTTMP/t
- no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss
+ no changes made to subrepo s/ss since last push to $TESTTMP/t/s/ss (glob)
no changes made to subrepo s since last push to $TESTTMP/t/s
no changes made to subrepo t since last push to $TESTTMP/t/t
searching for changes
@@ -467,7 +467,7 @@ KeyError
$ hg backout ".^"
reverting .hgsubstate
reverting subrepo s
- reverting s/a
+ reverting s/a (glob)
reverting subrepo ss
reverting subrepo t
0 files updated, 0 files merged, 0 files removed, 0 files unresolved