Mercurial > public > mercurial-scm > hg
diff tests/test-rebase-mq @ 11198:b345b1cc124f
rebase: use helpers.sh in tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 19 May 2010 20:20:12 -0500 |
parents | c2e1e637d4da |
children | 2313dc4d9817 |
line wrap: on
line diff
--- a/tests/test-rebase-mq Wed May 19 19:46:39 2010 -0500 +++ b/tests/test-rebase-mq 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 @@ -58,13 +60,13 @@ echo '% Fix the 1st conflict' echo 'mq1r1' > f hg resolve -m f -hg rebase -c 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' +hg rebase -c | hidebackup echo echo '% Fix the 2nd conflict' echo 'mq1r1mq2' > f hg resolve -m f -hg rebase -c 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' +hg rebase -c | hidebackup hg glog --template '{rev} {desc} tags: {tags}\n' @@ -109,7 +111,7 @@ echo echo '% Rebase the applied mq patches' -hg rebase -s 2 -d 1 --quiet 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' +hg rebase -s 2 -d 1 --quiet echo '% And the patches are correct' echo '% Git patch'