Mercurial > hg-stable
diff tests/test-rebase-pull @ 11198:b345b1cc124f
rebase: use helpers.sh in tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 19 May 2010 20:20:12 -0500 |
parents | c52057614c72 |
children | 2313dc4d9817 |
line wrap: on
line diff
--- a/tests/test-rebase-pull Wed May 19 19:46:39 2010 -0500 +++ b/tests/test-rebase-pull Wed May 19 20:20:12 2010 -0500 @@ -1,5 +1,7 @@ #!/bin/sh +source $TESTDIR/helpers.sh + echo "[extensions]" >> $HGRCPATH echo "graphlog=" >> $HGRCPATH echo "rebase=" >> $HGRCPATH @@ -34,14 +36,13 @@ cd ../b echo echo "% Now b has one revision to be pulled from a" -hg pull --rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' \ - -e 's/\(pulling from \).*/\1/' +hg pull --rebase | hidebackup | sed -e 's/\(pulling from \).*/\1/' hg glog --template '{rev}:{desc}\n' echo echo "% Re-run pull --rebase" -hg pull --rebase 2>&1 | sed 's/\(pulling from \).*/\1/' +hg pull --rebase | sed 's/\(pulling from \).*/\1/' echo echo "% Invoke pull --rebase and nothing to rebase"