Mercurial > hg-git

changeset 520:c3aca18b4688

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-subrepos: fix up test now that it's executable
author Augie Fackler <raf@durin42.com>
date Thu, 13 Sep 2012 09:36:24 -0500
parents 43fd68e75159
children ea98d659fca7
files tests/test-subrepos tests/test-subrepos.out
diffstat 2 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-subrepos	Thu Sep 13 09:19:38 2012 -0500
+++ b/tests/test-subrepos	Thu Sep 13 09:36:24 2012 -0500
@@ -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_
-
--- a/tests/test-subrepos.out	Thu Sep 13 09:19:38 2012 -0500
+++ b/tests/test-subrepos.out	Thu Sep 13 09:36:24 2012 -0500
@@ -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