changeset 531:800625c63100

test-subrepos: fix test to actually pass against all supported versions
author Augie Fackler <raf@durin42.com>
date Fri, 14 Sep 2012 14:09:25 -0500
parents 1ec00e2805fb
children ebb26b675663
files tests/test-subrepos
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-subrepos
+++ b/tests/test-subrepos
@@ -99,7 +99,7 @@
 git pull | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/|  */| /'
 cd ../..
 echo xxx >> alpha
-hg commit -m 'Update subrepo2 from hg'
+hg commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository"
 hg push
 cd ..
 cd gitrepo1
@@ -127,9 +127,9 @@
 gitcommit -m "Test3. Prepare .hgsub and .hgsubstate sources"
 cd ../hgrepo
 hg pull
-hg checkout -C  | sed s_$(dirname $(pwd))_TEMPLOCATION_
+hg checkout -C  | sed "s_$(dirname $(pwd))_TEMPLOCATION_"
 cd ..
 echo % pull shall bring .hgsub entry which was added to the git repo
-cat hgrepo/.hgsub | sed s_$(pwd)_TEMPLOCATION_
+cat hgrepo/.hgsub | sed "s_$(pwd)_TEMPLOCATION_"
 echo % .hgsubstate shall list revision of the subrepo added through git repo
-cat hgrepo/.hgsubstate | sed s_$(pwd)_TEMPLOCATION_
+cat hgrepo/.hgsubstate | sed "s_$(pwd)_TEMPLOCATION_"