Mercurial > hg-stable
changeset 20105:c5a0f899e47b stable
tests: deal with new gits sending status messages to stderr
git-1.8.4.2 will send messages like
Cloning into 'X'...
done.
to stderr.
Mute stderr.
| author | Mads Kiilerich <madski@unity3d.com> |
|---|---|
| date | Sat, 16 Nov 2013 19:55:38 -0500 |
| parents | 224e96078708 |
| children | c33d9217e99d |
| files | tests/test-subrepo-git.t |
| diffstat | 1 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-subrepo-git.t Mon Nov 25 13:50:36 2013 -0600 +++ b/tests/test-subrepo-git.t Sat Nov 16 19:55:38 2013 -0500 @@ -71,7 +71,7 @@ clone root $ cd t - $ hg clone . ../tc + $ hg clone . ../tc 2> /dev/null updating to branch default cloning subrepo s from $TESTTMP/gitroot 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -94,7 +94,7 @@ clone root, make local change $ cd ../t - $ hg clone . ../ta + $ hg clone . ../ta 2> /dev/null updating to branch default cloning subrepo s from $TESTTMP/gitroot 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -113,7 +113,7 @@ clone root separately, make different local change $ cd ../t - $ hg clone . ../tb + $ hg clone . ../tb 2> /dev/null updating to branch default cloning subrepo s from $TESTTMP/gitroot 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -199,7 +199,7 @@ make and push changes to hg without updating the subrepo $ cd ../t - $ hg clone . ../td + $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.' updating to branch default cloning subrepo s from $TESTTMP/gitroot checking out detached HEAD in subrepo s @@ -317,7 +317,7 @@ $ hg add b $ hg commit -m b - $ hg clone ../t inner + $ hg clone ../t inner 2> /dev/null updating to branch default cloning subrepo s from $TESTTMP/gitroot 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -345,7 +345,7 @@ $ cd .. $ mkdir d - $ hg clone t d/t + $ hg clone t d/t 2> /dev/null updating to branch default cloning subrepo s from $TESTTMP/gitroot 3 files updated, 0 files merged, 0 files removed, 0 files unresolved @@ -364,7 +364,7 @@ $ hg commit --subrepos -qm missing abort: subrepo s is missing (in subrepo s) [255] - $ hg update -C + $ hg update -C 2> /dev/null cloning subrepo s from $TESTTMP/gitroot 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg sum | grep commit