--- a/tests/test-clone.t Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-clone.t Wed Nov 16 03:45:14 2011 +0100
@@ -85,7 +85,7 @@
$ hg clone -q -U --config 'paths.foobar=a#0' foobar f
$ hg -R f showconfig paths.default
- $TESTTMP/a#0
+ $TESTTMP/a#0 (glob)
Use --pull:
--- a/tests/test-rebase-detach.t Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-rebase-detach.t Wed Nov 16 03:45:14 2011 +0100
@@ -372,7 +372,7 @@
[255]
$ hg resolve --all -t internal:local
$ hg rebase -c
- saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg
+ saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob)
$ hg tglog
@ 8: 'H2'
|
--- a/tests/test-subrepo-recursion.t Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-subrepo-recursion.t Wed Nov 16 03:45:14 2011 +0100
@@ -23,10 +23,10 @@
$ hg add -S .hgsub
$ hg add -S foo/.hgsub
$ hg add -S foo/bar
- adding foo/bar/z.txt
+ adding foo/bar/z.txt (glob)
$ hg add -S
adding x.txt
- adding foo/y.txt
+ adding foo/y.txt (glob)
Test recursive status without committing anything:
@@ -67,7 +67,7 @@
$ hg commit -m 0-0-0 --config ui.commitsubrepos=No --subrepos
committing subrepository foo
- committing subrepository foo/bar
+ committing subrepository foo/bar (glob)
$ cd foo
$ echo y2 >> y.txt
@@ -186,7 +186,7 @@
$ rm -r dir
$ hg commit --subrepos -m 2-3-2
committing subrepository foo
- committing subrepository foo/bar
+ committing subrepository foo/bar (glob)
Log with the relationships between repo and its subrepo:
@@ -342,7 +342,7 @@
archiving (foo/bar) [================================>] 1/1 (glob)
cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
The newly cloned subrepos contain no working copy:
@@ -365,7 +365,7 @@
$ echo f > foo/f
$ hg archive --subrepos -r tip archive
cloning subrepo foo from $TESTTMP/empty/foo
- abort: destination '$TESTTMP/almost-empty/foo' is not empty
+ abort: destination '$TESTTMP/almost-empty/foo' is not empty (glob)
[255]
Clone and test outgoing:
@@ -374,11 +374,11 @@
$ hg clone repo repo2
updating to branch default
cloning subrepo foo from $TESTTMP/repo/foo
- cloning subrepo foo/bar from $TESTTMP/repo/foo/bar
+ cloning subrepo foo/bar from $TESTTMP/repo/foo/bar (glob)
3 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ cd repo2
$ hg outgoing -S
- comparing with $TESTTMP/repo
+ comparing with $TESTTMP/repo (glob)
searching for changes
no changes found
comparing with $TESTTMP/repo/foo
@@ -404,7 +404,7 @@
$ hg commit --subrepos -m 3-4-2
committing subrepository foo
$ hg outgoing -S
- comparing with $TESTTMP/repo
+ comparing with $TESTTMP/repo (glob)
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
@@ -434,7 +434,7 @@
Test incoming:
$ hg incoming -S
- comparing with $TESTTMP/repo2
+ comparing with $TESTTMP/repo2 (glob)
searching for changes
changeset: 3:2655b8ecc4ee
tag: tip
--- a/tests/test-subrepo.t Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-subrepo.t Wed Nov 16 03:45:14 2011 +0100
@@ -949,8 +949,8 @@
? s/f9
$ hg add -S
adding f8
- adding s/f10
- adding s/f9
+ adding s/f10 (glob)
+ adding s/f9 (glob)
$ hg st -S
A f8
A s/f10
@@ -993,7 +993,7 @@
? s/fn18
$ hg add -S 'glob:**fm*'
adding fm15
- adding s/fm17
+ adding s/fm17 (glob)
$ hg st -S
A fm15
A s/fm17
--- a/tests/test-win32text.t Wed Nov 16 03:45:14 2011 +0100
+++ b/tests/test-win32text.t Wed Nov 16 03:45:14 2011 +0100
@@ -112,7 +112,7 @@
abort: pretxncommit.crlf hook failed
[255]
$ hg revert -a
- forgetting d/f2
+ forgetting d/f2 (glob)
$ rm d/f2
$ hg rem f
@@ -177,10 +177,10 @@
$ for x in a b c d; do echo content > dupe/$x; done
$ hg -R dupe add
- adding dupe/a
- adding dupe/b
- adding dupe/c
- adding dupe/d
+ adding dupe/a (glob)
+ adding dupe/b (glob)
+ adding dupe/c (glob)
+ adding dupe/d (glob)
$ python unix2dos.py dupe/b dupe/c dupe/d
$ hg -R dupe ci -m a dupe/a
$ hg -R dupe ci -m b/c dupe/[bc]