# HG changeset patch # User Augie Fackler <raf@durin42.com> # Date 1347546984 18000 # Thu Sep 13 09:36:24 2012 -0500 # Node ID c3aca18b4688fcd6dc3b8699bb9387598f982a45 # Parent 43fd68e751592ecb2c4a97edeed501e8001a31d8 test-subrepos: fix up test now that it's executable diff --git a/tests/test-subrepos b/tests/test-subrepos --- a/tests/test-subrepos +++ b/tests/test-subrepos @@ -55,7 +55,7 @@ gitcommit -m 'add subrepo1' git submodule add ../gitsubrepo xyz/subrepo2 gitcommit -m 'add subrepo2' -# we are going to push to this repo from our hg clone, +# we are going to push to this repo from our hg clone, # allow commits despite working copy presense git config receive.denyCurrentBranch ignore cd .. @@ -96,7 +96,7 @@ cd .. cd hgrepo cd xyz/subrepo2 -git pull +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' @@ -133,4 +133,3 @@ 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_ - diff --git a/tests/test-subrepos.out b/tests/test-subrepos.out --- a/tests/test-subrepos.out +++ b/tests/test-subrepos.out @@ -26,7 +26,7 @@ 56f0304..aabf7cd master -> origin/master Updating 56f0304..aabf7cd Fast-forward - gamma | 1 + + gamma | 1 + 1 file changed, 1 insertion(+) create mode 100644 gamma pushing to git://localhost/gitrepo1