# HG changeset patch # User Mads Kiilerich # Date 2013-11-17 00:55:38 # Node ID c5a0f899e47b117f20abe2cf57edda0f83f3fdbf # Parent 224e960787084f4648dd20906ba43c141f9f827e 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. diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t --- a/tests/test-subrepo-git.t +++ b/tests/test-subrepo-git.t @@ -71,7 +71,7 @@ make $GITROOT pushable, by replacing it 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 @@ update to previous substate 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, make local change 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 upstream git changes 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 @@ create nested repo $ 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 @@ relative source expansion $ 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 @@ Don't crash if the subrepo is missing $ 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