Mercurial > hg
comparison tests/test-rebase-mq-skip @ 11198:b345b1cc124f
rebase: use helpers.sh in tests
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Wed, 19 May 2010 20:20:12 -0500 |
parents | 8766fee6f225 |
children | 2313dc4d9817 |
comparison
equal
deleted
inserted
replaced
11197:4bb4895e1693 | 11198:b345b1cc124f |
---|---|
1 #!/bin/sh | 1 #!/bin/sh |
2 # This emulates the effects of an hg pull --rebase in which the remote repo | 2 # This emulates the effects of an hg pull --rebase in which the remote repo |
3 # already has one local mq patch | 3 # already has one local mq patch |
4 | |
5 source $TESTDIR/helpers.sh | |
4 | 6 |
5 echo "[extensions]" >> $HGRCPATH | 7 echo "[extensions]" >> $HGRCPATH |
6 echo "graphlog=" >> $HGRCPATH | 8 echo "graphlog=" >> $HGRCPATH |
7 echo "rebase=" >> $HGRCPATH | 9 echo "rebase=" >> $HGRCPATH |
8 echo "mq=" >> $HGRCPATH | 10 echo "mq=" >> $HGRCPATH |
38 rm p1.patch | 40 rm p1.patch |
39 | 41 |
40 echo | 42 echo |
41 echo '% Rebase' | 43 echo '% Rebase' |
42 hg up -C qtip | 44 hg up -C qtip |
43 hg rebase 2>&1 | sed -e 's/\(saving bundle to \).*/\1/' | 45 hg rebase | hidebackup |
44 hg glog --template '{rev} {desc} tags: {tags}\n' | 46 hg glog --template '{rev} {desc} tags: {tags}\n' |