Skip to content
Snippets Groups Projects
Commit 475a4b13 authored by Matt Mackall's avatar Matt Mackall
Browse files

tests: backport some glob fixups

parent 2b4344f2
No related branches found
No related tags found
No related merge requests found
......@@ -22,7 +22,7 @@
adding d/b
$ hg mv d d-renamed
moving d/b to d-renamed/b
moving d/b to d-renamed/b (glob)
$ hg ci -m 'rename B'
$ hg up -q -C 1
......
......@@ -51,7 +51,7 @@
getting b/b
updating: b/b 4/5 files (80.00%)
updating: a/c 5/5 files (100.00%)
moving a/c to b/c
moving a/c to b/c (glob)
3 files updated, 0 files merged, 2 files removed, 0 files unresolved
(branch merge, don't forget to commit)
......
......@@ -391,7 +391,7 @@
$ hg -R s update '.^'
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
$ hg push
pushing to $TESTTMP/t
pushing to $TESTTMP/t (glob)
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
......@@ -400,7 +400,7 @@
[1]
$ echo foo >> s/a
$ hg push
pushing to $TESTTMP/t
pushing to $TESTTMP/t (glob)
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
......@@ -415,7 +415,7 @@
$ echo foo >> s/ss/a
$ hg -R s/ss commit -m 'test dirty store detection'
$ hg push
pushing to $TESTTMP/t
pushing to $TESTTMP/t (glob)
pushing subrepo s/ss to $TESTTMP/t/s/ss (glob)
searching for changes
adding changesets
......@@ -431,7 +431,7 @@
a subrepo store may be clean versus one repo but not versus another
$ hg push
pushing to $TESTTMP/t
pushing to $TESTTMP/t (glob)
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
......@@ -798,7 +798,7 @@
Try to push from the other side
$ hg -R issue1852a push `pwd`/issue1852c
pushing to $TESTTMP/issue1852c
pushing to $TESTTMP/issue1852c (glob)
pushing subrepo sub/repo to $TESTTMP/issue1852c/sub/repo (glob)
searching for changes
no changes found
......
......@@ -316,7 +316,7 @@
adding test
$ hg init repo-tag-target
$ hg -R repo-tag --config hooks.commit="\"hg\" push \"`pwd`/repo-tag-target\"" tag tag
pushing to $TESTTMP/repo-tag-target
pushing to $TESTTMP/repo-tag-target (glob)
searching for changes
adding changesets
adding manifests
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment