Mercurial > hg
comparison tests/test-rebase-interruptions @ 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 | 2 |
3 source $TESTDIR/helpers.sh | |
3 echo "[extensions]" >> $HGRCPATH | 4 echo "[extensions]" >> $HGRCPATH |
4 echo "graphlog=" >> $HGRCPATH | 5 echo "graphlog=" >> $HGRCPATH |
5 echo "rebase=" >> $HGRCPATH | 6 echo "rebase=" >> $HGRCPATH |
6 | 7 |
7 BASE=`pwd` | 8 BASE=`pwd` |
36 createrepo > /dev/null 2>&1 | 37 createrepo > /dev/null 2>&1 |
37 hg glog --template '{rev}: {desc}\n' | 38 hg glog --template '{rev}: {desc}\n' |
38 | 39 |
39 echo | 40 echo |
40 echo "% - Rebasing B onto E" | 41 echo "% - Rebasing B onto E" |
41 hg rebase -s 1 -d 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' | 42 hg rebase -s 1 -d 4 | hidebackup |
42 | 43 |
43 echo | 44 echo |
44 echo "% - Force a commit on C during the interruption" | 45 echo "% - Force a commit on C during the interruption" |
45 hg update -C 2 | 46 hg update -C 2 |
46 addcommit "Extra" 5 | 47 addcommit "Extra" 5 |
64 createrepo > /dev/null 2>&1 | 65 createrepo > /dev/null 2>&1 |
65 hg glog --template '{rev}: {desc}\n' | 66 hg glog --template '{rev}: {desc}\n' |
66 | 67 |
67 echo | 68 echo |
68 echo "% Rebasing B onto E" | 69 echo "% Rebasing B onto E" |
69 hg rebase -s 1 -d 4 2>&1 | sed 's/\(saving bundle to \).*/\1/' | 70 hg rebase -s 1 -d 4 | hidebackup |
70 | 71 |
71 echo | 72 echo |
72 echo "% Force a commit on B' during the interruption" | 73 echo "% Force a commit on B' during the interruption" |
73 hg update -C 5 | 74 hg update -C 5 |
74 addcommit "Extra" 6 | 75 addcommit "Extra" 6 |