--- 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